From a43bcbd4d1cd1056cf8ee7dd31e0e217326a5401 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Fri, 15 Nov 2013 16:09:45 +0100
Subject: [PATCH] [scripts] clean /var/run (/run) and /var/lock

systemd mounts them as tmpfs anyway
---
 scripts/amazon_ebs_image_inner_chroot_script_after.sh | 5 +++++
 scripts/image_generic_inner_chroot_script_after.sh    | 5 +++++
 scripts/inner_chroot_script.sh                        | 5 +++++
 scripts/remaster_post_common.sh                       | 5 +++++
 scripts/tar_generic_inner_chroot_script_after.sh      | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/scripts/amazon_ebs_image_inner_chroot_script_after.sh b/scripts/amazon_ebs_image_inner_chroot_script_after.sh
index 27c7fdc..a79a297 100755
--- a/scripts/amazon_ebs_image_inner_chroot_script_after.sh
+++ b/scripts/amazon_ebs_image_inner_chroot_script_after.sh
@@ -119,4 +119,9 @@ rm -f /etc/entropy/.hw.hash
 # remove entropy pid file
 rm -f /var/run/entropy/entropy.lock
 
+# remove /run/* and /var/lock/*
+# systemd mounts them using tmpfs
+rm -rf /run/*
+rm -rf /var/lock/*
+
 exit 0
diff --git a/scripts/image_generic_inner_chroot_script_after.sh b/scripts/image_generic_inner_chroot_script_after.sh
index 45f3243..2b872ea 100755
--- a/scripts/image_generic_inner_chroot_script_after.sh
+++ b/scripts/image_generic_inner_chroot_script_after.sh
@@ -104,4 +104,9 @@ rm -f /etc/entropy/.hw.hash
 # remove entropy pid file
 rm -f /var/run/entropy/entropy.lock
 
+# remove /run/* and /var/lock/*
+# systemd mounts them using tmpfs
+rm -rf /run/*
+rm -rf /var/lock/*
+
 exit 0
diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh
index 9fee731..bd10a13 100755
--- a/scripts/inner_chroot_script.sh
+++ b/scripts/inner_chroot_script.sh
@@ -224,4 +224,9 @@ rm -f /var/run/entropy/entropy.lock
 rm -f /var/lib/entropy/entropy.pid
 rm -f /var/lib/entropy/entropy.lock # old?
 
+# remove /run/* and /var/lock/*
+# systemd mounts them using tmpfs
+rm -rf /run/*
+rm -rf /var/lock/*
+
 exit 0
diff --git a/scripts/remaster_post_common.sh b/scripts/remaster_post_common.sh
index 1f65096..ac35be4 100755
--- a/scripts/remaster_post_common.sh
+++ b/scripts/remaster_post_common.sh
@@ -23,4 +23,9 @@ rm -f "${CHROOT_DIR}"/etc/entropy/.hw.hash
 # remove entropy pid file
 rm -f "${CHROOT_DIR}"/var/run/entropy/entropy.lock
 
+# remove /run/* and /var/lock/*
+# systemd mounts them using tmpfs
+rm -rf "${CHROOT_DIR}"/run/*
+rm -rf "${CHROOT_DIR}"/var/lock/*
+
 # do not exit!! this file is sourced!
diff --git a/scripts/tar_generic_inner_chroot_script_after.sh b/scripts/tar_generic_inner_chroot_script_after.sh
index 69c0721..78867d6 100755
--- a/scripts/tar_generic_inner_chroot_script_after.sh
+++ b/scripts/tar_generic_inner_chroot_script_after.sh
@@ -67,4 +67,9 @@ rm -f /etc/entropy/.hw.hash
 # remove entropy pid file
 rm -f /var/run/entropy/entropy.lock
 
+# remove /run/* and /var/lock/*
+# systemd mounts them using tmpfs
+rm -rf /run/*
+rm -rf /var/lock/*
+
 exit 0