From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 21 Mar 2014 15:55:07 +0000 (+0000)
Subject: x86: fix sysupgrade
X-Git-Tag: reboot~7651
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a14437024cf31264a4e767dad4be5f37f6211a38;p=oweals%2Fopenwrt.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 <slachta@cesnet.cz>

SVN-Revision: 39996
---

diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config
new file mode 100644
index 0000000000..0bffbab994
--- /dev/null
+++ b/target/linux/x86/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
+
diff --git a/target/linux/x86/base-files/lib/preinit/89_move_config b/target/linux/x86/base-files/lib/preinit/89_move_config
deleted file mode 100644
index ba337e10ec..0000000000
--- a/target/linux/x86/base-files/lib/preinit/89_move_config
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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_main move_config
-