summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbaserock-system-config-sync/baserock-system-config-sync8
1 files changed, 8 insertions, 0 deletions
diff --git a/baserock-system-config-sync/baserock-system-config-sync b/baserock-system-config-sync/baserock-system-config-sync
index 47da83d..7b7c697 100755
--- a/baserock-system-config-sync/baserock-system-config-sync
+++ b/baserock-system-config-sync/baserock-system-config-sync
@@ -224,6 +224,14 @@ if [ "$1" = "merge" ]; then
merge "$vu_dir" "$v1_dir" "$vu_dir" "$v2_dir" "$vt_dir"
merge "$v2_dir" "$v1_dir" "$vu_dir" "$v2_dir" "$vt_dir"
+ if [ -f "$vu_dir/passwd" ]; then
+ cp "$vu_dir/passwd" "$vt_dir/passwd"
+ fi
+ if [ -f "$vu_dir/group" ]; then
+ cp "$vu_dir/group" "$vt_dir/group"
+ fi
+
+
rm -rf "$v2_dir"
mv "$vt_dir" "$v2_dir"
elif [ "$1" = "sync" ]; then