aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2020-04-17 00:32:18 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2020-05-03 17:30:45 +0300
commit49ab97ca86593de1bcb16c70e58e3cb62c16623d (patch)
treea2b5f0974c8a3bf9728e0702a1a4f13b48658b3f /target/linux
parentad27c133eb606ee39fa346b7bdb26c1764ee869e (diff)
downloadupstream-49ab97ca86593de1bcb16c70e58e3cb62c16623d.tar.gz
upstream-49ab97ca86593de1bcb16c70e58e3cb62c16623d.tar.bz2
upstream-49ab97ca86593de1bcb16c70e58e3cb62c16623d.zip
bcm27xx: backup /boot/cmdline.txt and restore early
If you want to use the Raspberry Pi UART, "console=serial0,115200" needs to be removed from the kernel cmdline. This is done by editing /boot/cmdline.txt. However, this file is not currently backed up during sysupgrade, so this effectively breaks HATs that require the use of the UART every sysupgrade. Backup this file during sysupgrade, and restore it before rebooting. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/bcm27xx/base-files/lib/upgrade/keep.d/platform1
-rw-r--r--target/linux/bcm27xx/base-files/lib/upgrade/platform.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/bcm27xx/base-files/lib/upgrade/keep.d/platform b/target/linux/bcm27xx/base-files/lib/upgrade/keep.d/platform
index 786796577d..22f09da43d 100644
--- a/target/linux/bcm27xx/base-files/lib/upgrade/keep.d/platform
+++ b/target/linux/bcm27xx/base-files/lib/upgrade/keep.d/platform
@@ -1 +1,2 @@
+/boot/cmdline.txt
/boot/config.txt
diff --git a/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh
index 811355b8f7..37c77edb34 100644
--- a/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm27xx/base-files/lib/upgrade/platform.sh
@@ -92,7 +92,7 @@ platform_copy_config() {
mkdir -p /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/config.txt
+ tar -C / -zxvf "$UPGRADE_BACKUP" boot/cmdline.txt boot/config.txt
sync
unmount /boot
fi