From f033db3422e541b1b01063b54a1d6df2ec6f1254 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Fri, 28 Feb 2014 17:23:38 +0000
Subject: baserock-system-config-sync: Force copy /etc/passwd and /etc/group

---
 baserock-system-config-sync/baserock-system-config-sync | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'baserock-system-config-sync')

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
-- 
cgit v1.2.1