x86: make sysupgrade.tgz reachable again

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 <[email protected]>
Signed-off-by: Tomasz Maciej Nowak <[email protected]>
(backported from c288ad9c2b2a4ab62e4c887f13f220870911cc28)

diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config
index debce43557849689114699930cc6a1e50f4f9d9e..aff720a52c5afc6e4a1dee5a67d14b953f975eae 100644 (file)
--- a/target/linux/x86/base-files/lib/preinit/79_move_config
+++ b/target/linux/x86/base-files/lib/preinit/79_move_config
@@ -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
 }