Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bcm2711: Use FS UUID and write config.txt and cmdline.txt earlier #6503

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bcm2711: Use FS UUID for mounting root instead of label
This brings this family in line with most others that are u-boot based
and already use UUIDs and makes booting more reliable.
  • Loading branch information
matthijskooijman committed Apr 19, 2024
commit 272874031c6e12c1b8ce280d6a58c93e798dcf62
2 changes: 1 addition & 1 deletion config/sources/families/bcm2711.conf
Original file line number Diff line number Diff line change
@@ -292,7 +292,7 @@ function pre_umount_final_image__write_raspi_config() {

function pre_umount_final_image__write_raspi_cmdline() {
cat <<- EOD > "${MOUNT}"/boot/firmware/cmdline.txt
console=serial0,115200 console=tty1 loglevel=1 root=LABEL=${ROOT_FS_LABEL} rootfstype=${ROOTFS_TYPE} fsck.repair=yes rootwait logo.nologo cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory
console=serial0,115200 console=tty1 loglevel=1 root=UUID=${ROOT_PART_UUID} rootfstype=${ROOTFS_TYPE} fsck.repair=yes rootwait logo.nologo cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory
EOD

if [[ "${SHOW_DEBUG}" == "yes" ]]; then