summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-28 17:23:38 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-03-04 17:30:11 +0000
commitf033db3422e541b1b01063b54a1d6df2ec6f1254 (patch)
treea83347a40a0f6473278b601bf2f3e31516a71c14
parentf7690df2a8a3596bacd591318c83f15c4315114f (diff)
downloadtbdiff-f033db3422e541b1b01063b54a1d6df2ec6f1254.tar.gz
baserock-system-config-sync: Force copy /etc/passwd and /etc/group
-rwxr-xr-xbaserock-system-config-sync/baserock-system-config-sync4
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