diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-03-21 15:55:11 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-21 15:55:11 +0000 |
| commit | 46003ab374fad0ade4d8820d1539c2b887f6e0ea (patch) | |
| tree | 43a5d833295a56e0c7ff531411e32df208e6380b /target/linux | |
| parent | 6b5b2eca735769908858ca009b0e7c8d76556275 (diff) | |
| download | upstream-46003ab374fad0ade4d8820d1539c2b887f6e0ea.tar.gz upstream-46003ab374fad0ade4d8820d1539c2b887f6e0ea.tar.bz2 upstream-46003ab374fad0ade4d8820d1539c2b887f6e0ea.zip | |
x86_64: 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 issue was introduced for target x86. Since the target for x86_64 is
similar to x86, this issue is present also in this target. It solves the
ticket #15042 and #14088.
Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
Tested-By: Stefan Hellermann <stefan@the2masters.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39997 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/x86_64/base-files/lib/preinit/79_move_config (renamed from target/linux/x86_64/base-files/lib/preinit/89_move_config) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/x86_64/base-files/lib/preinit/89_move_config b/target/linux/x86_64/base-files/lib/preinit/79_move_config index ba337e10ec..0bffbab994 100644 --- a/target/linux/x86_64/base-files/lib/preinit/89_move_config +++ b/target/linux/x86_64/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 |