From fdfe2c2e6e62e895a4adc5b4be6575af3cbcf83b Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 22 Jan 2014 12:16:35 -0800
Subject: [PATCH] fix(tmpfiles): auto-generate tmpfiles based on .keep

To avoid having to sync directory creation and tmpfiles installed by
ebuilds just require ebuilds to do `keepdir /etc/path` and this script
will handle the rest. A possible extension would be to update to handle
symlinks in addition to directories in gen_tmpfiles.py
---
 build_library/base_image_util.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index be72ffb3b8..eb9014b56e 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -42,8 +42,13 @@ create_base_image() {
   # Record directories installed to the state partition.
   # Ignore /var/tmp, systemd covers this entry.
   sudo "${BUILD_LIBRARY_DIR}/gen_tmpfiles.py" --root="${root_fs_dir}" \
-      --output="${root_fs_dir}/usr/lib/tmpfiles.d/base_image.conf" \
+      --output="${root_fs_dir}/usr/lib/tmpfiles.d/base_image_var.conf" \
       --ignore=/var/tmp "${root_fs_dir}/var"
+  if [[ "${disk_layout}" == *-usr ]]; then
+      sudo "${BUILD_LIBRARY_DIR}/gen_tmpfiles.py" --root="${root_fs_dir}" \
+          --output="${root_fs_dir}/usr/lib/tmpfiles.d/base_image_etc.conf" \
+          "${root_fs_dir}/etc"
+  fi
 
   # Set /etc/lsb-release on the image.
   "${BUILD_LIBRARY_DIR}/set_lsb_release" \