mirror of
https://github.com/FUjr/gl-infra-builder.git
synced 2025-12-16 09:10:02 +00:00
28 lines
980 B
Diff
28 lines
980 B
Diff
From 173140db64fdc371962d0802b359b462d54e37e9 Mon Sep 17 00:00:00 2001
|
|
From: Jianhui Zhao <jianhui.zhao@gl-inet.com>
|
|
Date: Tue, 24 May 2022 11:36:43 +0800
|
|
Subject: [PATCH 2/3] Revert "base-files: ignore sysupgrade that was not ours"
|
|
|
|
This reverts commit a222d4943e328cd6c8929bee4bb0712c66e2ee42.
|
|
---
|
|
package/base-files/files/lib/preinit/80_mount_root | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root
|
|
index 7cf16e68e0..3f75411a43 100644
|
|
--- a/package/base-files/files/lib/preinit/80_mount_root
|
|
+++ b/package/base-files/files/lib/preinit/80_mount_root
|
|
@@ -17,8 +17,7 @@ missing_lines() {
|
|
do_mount_root() {
|
|
mount_root
|
|
boot_run_hook preinit_mount_root
|
|
- (tar tf /sysupgrade.tgz | grep ucentral) 2> /dev/null
|
|
- [ $? -eq 0 ] && {
|
|
+ [ -f /sysupgrade.tgz ] && {
|
|
echo "- config restore -"
|
|
cp /etc/passwd /etc/group /etc/shadow /tmp
|
|
cd /
|
|
--
|
|
2.25.1
|
|
|