From 1ab488ba9c403b804c784c2a3687577a8a0c4aa4 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@coreos.com>
Date: Thu, 13 Mar 2014 18:47:44 -0700
Subject: [PATCH] fix(sys-apps/baselayout): seed root user in passwd & shadow

---
 ...{baselayout-3.0.0-r7.ebuild => baselayout-3.0.0-r8.ebuild} | 0
 .../coreos-overlay/sys-apps/baselayout/files/coreos-tmpfiles  | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.0.0-r7.ebuild => baselayout-3.0.0-r8.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r8.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r8.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/files/coreos-tmpfiles b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/files/coreos-tmpfiles
index 4d7d80ba1a..5d58b2f4a9 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/files/coreos-tmpfiles
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/files/coreos-tmpfiles
@@ -10,7 +10,7 @@ BASE="${ROOT}/usr/share/baselayout"
 # readable files
 umask 022
 if [[ ! -e "${ROOT}/etc/passwd" ]]; then
-    grep "^core:" "${BASE}/passwd" > "${ROOT}/etc/passwd"
+    grep -e "^root:" -e "^core:" "${BASE}/passwd" > "${ROOT}/etc/passwd"
 fi
 if [[ ! -e "${ROOT}/etc/group" ]]; then
     grep "^docker:" "${BASE}/group" > "${ROOT}/etc/group"
@@ -19,7 +19,7 @@ fi
 # secure files
 umask 027
 if [[ ! -e "${ROOT}/etc/shadow" ]]; then
-    grep "^core:" "${BASE}/shadow" > "${ROOT}/etc/shadow"
+    grep -e "^root:" -e "^core:" "${BASE}/shadow" > "${ROOT}/etc/shadow"
 fi
 if [[ ! -e "${ROOT}/etc/gshadow" ]]; then
     grep "^docker:" "${BASE}/gshadow" > "${ROOT}/etc/gshadow"