ソースを参照

base-files: add support for restoring config from tmpfs

Instead of only relying in /sysupgrade.tgz being present in rootfs to
restore configuration, also grab /tmp/sysupgrade.tar which may have
magically gotten there during preinit...

Signed-off-by: Daniel Golle <[email protected]>
Daniel Golle 4 年 前
コミット
84a339f015
1 ファイル変更3 行追加2 行削除
  1. 3 2
      package/base-files/files/lib/preinit/80_mount_root

+ 3 - 2
package/base-files/files/lib/preinit/80_mount_root

@@ -17,11 +17,12 @@ missing_lines() {
 do_mount_root() {
 do_mount_root() {
 	mount_root
 	mount_root
 	boot_run_hook preinit_mount_root
 	boot_run_hook preinit_mount_root
-	[ -f /sysupgrade.tgz ] && {
+	[ -f /sysupgrade.tgz -o -f /tmp/sysupgrade.tar ] && {
 		echo "- config restore -"
 		echo "- config restore -"
 		cp /etc/passwd /etc/group /etc/shadow /tmp
 		cp /etc/passwd /etc/group /etc/shadow /tmp
 		cd /
 		cd /
-		tar xzf /sysupgrade.tgz
+		[ -f /sysupgrade.tgz ] && tar xzf /sysupgrade.tgz
+		[ -f /tmp/sysupgrade.tar ] && tar xf /tmp/sysupgrade.tar
 		missing_lines /tmp/passwd /etc/passwd >> /etc/passwd
 		missing_lines /tmp/passwd /etc/passwd >> /etc/passwd
 		missing_lines /tmp/group /etc/group >> /etc/group
 		missing_lines /tmp/group /etc/group >> /etc/group
 		missing_lines /tmp/shadow /etc/shadow >> /etc/shadow
 		missing_lines /tmp/shadow /etc/shadow >> /etc/shadow