x86: make sysupgrade.tgz reachable again
authorTomasz Maciej Nowak <tomek_n@o2.pl>
Wed, 28 Nov 2018 19:44:21 +0000 (20:44 +0100)
committerJo-Philipp Wich <jo@mein.io>
Tue, 18 Dec 2018 16:22:08 +0000 (17:22 +0100)
Moving binding mount before check for saved sysupgrade configuration
made it unreachable. Fix it by moving binding mount after the check.

Fixes: f78b2616 (x86: mount writable bootfs)
Reported-by: Lucian Cristian <luci@powerneth.ro>
Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
(backported from c288ad9c2b2a4ab62e4c887f13f220870911cc28)

target/linux/x86/base-files/lib/preinit/79_move_config

index debce43..aff720a 100644 (file)
@@ -9,10 +9,10 @@ move_config() {
        if export_bootdevice && export_partdevice partdev 1; then
                mkdir -p /boot
                mount -t ext4 -o rw,noatime "/dev/$partdev" /boot
-               mount --bind /boot/boot /boot
                if [ -f /boot/sysupgrade.tgz ]; then
                        mv -f /boot/sysupgrade.tgz /
                fi
+               mount --bind /boot/boot /boot
        fi
 }