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 | 7c78ab8c2190e55663dfd2cf3ea1559fb8564450 (patch) | |
| tree | c941b066586759c3b4435eea1520b5d74bbea0fd /target/linux/x86_64/base-files/lib/preinit/79_move_config | |
| parent | a14437024cf31264a4e767dad4be5f37f6211a38 (diff) | |
| download | upstream-7c78ab8c2190e55663dfd2cf3ea1559fb8564450.tar.gz upstream-7c78ab8c2190e55663dfd2cf3ea1559fb8564450.tar.bz2 upstream-7c78ab8c2190e55663dfd2cf3ea1559fb8564450.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>
SVN-Revision: 39997
Diffstat (limited to 'target/linux/x86_64/base-files/lib/preinit/79_move_config')
| -rw-r--r-- | target/linux/x86_64/base-files/lib/preinit/79_move_config | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/x86_64/base-files/lib/preinit/79_move_config b/target/linux/x86_64/base-files/lib/preinit/79_move_config new file mode 100644 index 0000000000..0bffbab994 --- /dev/null +++ b/target/linux/x86_64/base-files/lib/preinit/79_move_config @@ -0,0 +1,22 @@ +#!/bin/sh +# Copyright (C) 2012 OpenWrt.org + +move_config() { + local rootfsdev + local rootfstype + + rootfstype="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "rootfstype") { print $2 }' < /proc/cmdline)" + case "$rootfstype" in + squashfs|jffs2) + rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)";; + ext4) + rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 }' < /proc/cmdline)";; + esac + + mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt + mv -f /mnt/sysupgrade.tgz / + umount /mnt +} + +boot_hook_add preinit_mount_root move_config + |