From: nbd Date: Fri, 21 Mar 2014 15:55:07 +0000 (+0000) Subject: x86: fix sysupgrade X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=7c5c2158a36ee27dfbef6e4d8a288ba7b9656833;hp=06776a6ed9b711008460fe80dfe039241a558844;p=openwrt-working-2016%2F.git x86: fix sysupgrade Function move_config should be called after or during preinit_mount_root hook in do_mount_root function. At this state sysupgrade.tgz is not in its place during that time when do_mount_root is called. Function move_config is called later so the sysupgrade.tgz stays in root directory to the second restart when it is unpacked properly. This patch adds move_config function to preinit_mount_root hook instead of preinit_main and changes the filename of script to be called before 80_mount_root is called. It will prepare the sysupgrade archive for do_mount_root within preinit_mount_root hook. This patch solves ticket #15042 and #14088. Signed-off-by: Jiri Slachta git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39996 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/x86/base-files/lib/preinit/89_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config similarity index 92% rename from target/linux/x86/base-files/lib/preinit/89_move_config rename to target/linux/x86/base-files/lib/preinit/79_move_config index ba337e10ec..0bffbab994 100644 --- a/target/linux/x86/base-files/lib/preinit/89_move_config +++ b/target/linux/x86/base-files/lib/preinit/79_move_config @@ -18,5 +18,5 @@ move_config() { umount /mnt } -boot_hook_add preinit_main move_config +boot_hook_add preinit_mount_root move_config