Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm27xx: use PARTUUID for root in cmdline

Browse Source 
This allows booting from USB/NVME while keeping SD compatibility.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2024-01-30 21:30:20 +01:00
parent 4b3c1251a4
commit fe0081eecf
5 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/bcm27xx/base-files/lib/preinit/79_move_config
View File

@ -16,7 +16,10 @@ move_config() {
insmod vfat insmod vfat
mkdir -p /boot mkdir -p /boot
mount -t vfat -o rw,noatime /dev/$partdev /boot mount -t vfat -o rw,noatime /dev/$partdev /boot
[ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" / if [ -f "/boot/$BACKUP_FILE" ]; then
mv -f "/boot/$BACKUP_FILE" /
export BCM27XX_SET_ROOT_PART=1
fi
fi fi
} }

12
target/linux/bcm27xx/base-files/lib/preinit/81_set_root_part Normal file
View File

@ -0,0 +1,12 @@
# SPDX-License-Identifier: GPL-2.0-only
. /lib/upgrade/platform.sh
do_set_root_part() {
if [ "$BCM27XX_SET_ROOT_PART" -eq "1" ]; then
bcm27xx_set_root_part
unset BCM27XX_SET_ROOT_PART
fi
}
[ "$INITRAMFS" = "1" ] || boot_hook_add preinit_main do_set_root_part

33
target/linux/bcm27xx/base-files/lib/upgrade/platform.sh
View File

@ -85,15 +85,46 @@ platform_do_upgrade() {
get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
} }
bcm27xx_set_root_part() {
local root_part
if [ -f "/boot/partuuid.txt" ]; then
root_part="PARTUUID=$(cat "/boot/partuuid.txt")-02"
else
root_part="/dev/mmcblk0p2"
fi
sed -i "s#\broot=[^ ]*#root=${root_part}#g" "/boot/cmdline.txt"
}
platform_copy_config() { platform_copy_config() {
local partdev local partdev
if export_partdevice partdev 1; then if export_partdevice partdev 1; then
mkdir -p /boot mkdir -p /boot
[ -f /boot/kernel*.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot [ -f /boot/kernel*.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot
cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE"
tar -C / -zxvf "$UPGRADE_BACKUP" boot/cmdline.txt boot/config.txt tar -C / -zxvf "$UPGRADE_BACKUP" boot/cmdline.txt boot/config.txt
bcm27xx_set_root_part
local backup_tmp="/tmp/backup-update"
mkdir -p $backup_tmp
tar -C $backup_tmp -zxvf $UPGRADE_BACKUP
cp -af /boot/cmdline.txt $backup_tmp/boot/
local work_dir=$(pwd)
cd $backup_tmp
tar -C $backup_tmp -zcvf /boot/$BACKUP_FILE *
cd $work_dir
sync sync
umount /boot umount /boot
fi fi
} }
platform_restore_backup() {
local TAR_V=$1
tar -C / -x${TAR_V}zf "$CONF_RESTORE"
bcm27xx_set_root_part
}

8
target/linux/bcm27xx/image/Makefile
View File

@ -15,13 +15,19 @@ endef
### Image scripts ### ### Image scripts ###
define Build/boot-common define Build/boot-common
echo $(IMG_PART_SIGNATURE) > $@-partuuid.txt
sed \
-e 's#@ROOT@#PARTUUID=$(IMG_PART_SIGNATURE)-02#g' \
cmdline.txt > $@-cmdline.txt
rm -f $@.boot rm -f $@.boot
mkfs.fat -n boot -C $@.boot $(FAT32_BLOCKS) mkfs.fat -n boot -C $@.boot $(FAT32_BLOCKS)
mcopy -i $@.boot $(KDIR)/COPYING.linux :: mcopy -i $@.boot $(KDIR)/COPYING.linux ::
mcopy -i $@.boot $(KDIR)/LICENCE.broadcom :: mcopy -i $@.boot $(KDIR)/LICENCE.broadcom ::
mcopy -i $@.boot cmdline.txt :: mcopy -i $@.boot $@-cmdline.txt ::cmdline.txt
mcopy -i $@.boot config.txt :: mcopy -i $@.boot config.txt ::
mcopy -i $@.boot distroconfig.txt :: mcopy -i $@.boot distroconfig.txt ::
mcopy -i $@.boot $@-partuuid.txt ::partuuid.txt
mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG) mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG)
$(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::;) $(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::;)
mmd -i $@.boot ::/overlays mmd -i $@.boot ::/overlays

2
target/linux/bcm27xx/image/cmdline.txt
View File

@ -1 +1 @@
console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=squashfs,ext4 rootwait console=serial0,115200 console=tty1 root=@ROOT@ rootfstype=squashfs,ext4 rootwait