| Message ID | 20181128194421.1712-1-tomek_n@o2.pl |
|---|---|
| State | Accepted |
| Delegated to: | John Crispin |
| Headers | show |
| Series | [OpenWrt-Devel] x86: make sysupgrade.tgz reachable again | expand |
On 28.11.2018 21:44, Tomasz Maciej Nowak wrote: > 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> > --- > target/linux/x86/base-files/lib/preinit/79_move_config | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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 debce43557..aff720a52c 100644 > --- 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 > } > Can we have this merged ? Regards
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 debce43557..aff720a52c 100644 --- 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 }
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> --- target/linux/x86/base-files/lib/preinit/79_move_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)