From a14437024cf31264a4e767dad4be5f37f6211a38 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 21 Mar 2014 15:55:07 +0000
Subject: [PATCH] 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
---
 .../base-files/lib/preinit/{89_move_config => 79_move_config}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename target/linux/x86/base-files/lib/preinit/{89_move_config => 79_move_config} (92%)

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
 
-- 
2.30.2