From de7ca7dafadfd650d031e0379ce0c002868d5936 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 22 Oct 2020 13:13:39 +0100 Subject: base-files: merge /etc/passwd et al at sysupgrade config restore Signed-off-by: Daniel Golle --- package/base-files/files/lib/preinit/80_mount_root | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'package/base-files/files/lib/preinit/80_mount_root') diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root index 265a3f18df..56d3fa3797 100644 --- a/package/base-files/files/lib/preinit/80_mount_root +++ b/package/base-files/files/lib/preinit/80_mount_root @@ -2,6 +2,19 @@ # Copyright (C) 2006 OpenWrt.org # Copyright (C) 2010 Vertical Communications +missing_lines() { + local file1 file2 line + file1="$1" + file2="$2" + oIFS="$IFS" + IFS=":" + while read line; do + set -- $line + grep -q "^$1:" "$file2" || echo "$*" + done < "$file1" + IFS="$oIFS" +} + do_mount_root() { mount_root boot_run_hook preinit_mount_root @@ -9,6 +22,9 @@ do_mount_root() { echo "- config restore -" cd / tar xzf /sysupgrade.tgz + missing_lines /rom/etc/passwd /etc/passwd >> /etc/passwd + missing_lines /rom/etc/group /etc/group >> /etc/group + missing_lines /rom/etc/shadow /etc/shadow >> /etc/shadow # Prevent configuration corruption on a power loss sync } -- cgit v1.2.3