aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-03-21 15:55:07 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-03-21 15:55:07 +0000
commita14437024cf31264a4e767dad4be5f37f6211a38 (patch)
treef66f25e5fb84e165b469d92cdb82e44dae4feeff /target/linux/x86
parentc53c7a0fe0e626801c7d3de9cf14aad0665648c1 (diff)
downloadupstream-a14437024cf31264a4e767dad4be5f37f6211a38.tar.gz
upstream-a14437024cf31264a4e767dad4be5f37f6211a38.tar.bz2
upstream-a14437024cf31264a4e767dad4be5f37f6211a38.zip
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 <slachta@cesnet.cz> SVN-Revision: 39996
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/base-files/lib/preinit/79_move_config (renamed from target/linux/x86/base-files/lib/preinit/89_move_config)2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/x86/base-files/lib/preinit/89_move_config b/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