diff options
-rwxr-xr-x | baserock-system-config-sync/baserock-system-config-sync | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/baserock-system-config-sync/baserock-system-config-sync b/baserock-system-config-sync/baserock-system-config-sync index ada8de4..be9928c 100755 --- a/baserock-system-config-sync/baserock-system-config-sync +++ b/baserock-system-config-sync/baserock-system-config-sync @@ -224,6 +224,10 @@ 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" + cp "$vu_dir/passwd" "$vt_dir/passwd" + cp "$vu_dir/group" "$vt_dir/group" + + rm -rf "$v2_dir" mv "$vt_dir" "$v2_dir" elif [ "$1" = "sync" ]; then |