From 438478f0cf9c9aa931981b17b806404fca6e98f7 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 14 Feb 2014 16:13:31 -0800
Subject: [PATCH] fix(base_image_util): Do not auto-generate conflicting
 tmpfiles entries

Many directories are now handled by the new baselayout instead.
---
 build_library/base_image_util.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index c319bf3189..38f88f5b3c 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -38,14 +38,16 @@ create_base_image() {
   sudo ROOT="${root_fs_dir}" env-update
 
   # Record directories installed to the state partition.
-  # Ignore /var/tmp, systemd covers this entry.
+  # Explicitly ignore entries covered by existing configs.
+  local tmp_ignore=$(awk '/^[dDfFL]/ {print "--ignore=" $2}' \
+      "${root_fs_dir}"/usr/lib/tmpfiles.d/*.conf)
   sudo "${BUILD_LIBRARY_DIR}/gen_tmpfiles.py" --root="${root_fs_dir}" \
       --output="${root_fs_dir}/usr/lib/tmpfiles.d/base_image_var.conf" \
-      --ignore=/var/tmp "${root_fs_dir}/var"
+      ${tmp_ignore} "${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"
+          ${tmp_ignore} "${root_fs_dir}/etc"
   fi
 
   # Set /etc/lsb-release on the image.