0023-Ensure-var-run-is-never-a-directory.patch

From b9564fff6d7bd1ac10782c8d6d7cdc7c905935b2 Mon Sep 17 00:00:00 2001
From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Fri, 14 Jul 2017 11:34:00 -0700
Subject: [PATCH 23/38] Ensure /var/run is never a directory.

---
 src/shared/mount-setup.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
index d8a95f4941..bbe1112cc8 100644
--- a/src/shared/mount-setup.c
+++ b/src/shared/mount-setup.c
@@ -510,11 +510,19 @@ static int relabel_extra(void) {
 
 int mount_setup(bool loaded_policy, bool leave_propagation) {
         int r;
+        struct stat sb;
 
         r = mount_points_setup(ELEMENTSOF(mount_table), loaded_policy);
         if (r < 0)
                 return r;
 
+        r = lstat("/var/run", &sb);
+        if (r == 0 && sb.st_mode & S_IFDIR) {
+                char path[256];
+                sprintf(path, "/var/run.%i", (int)time(NULL));
+                rename("/var/run", path);
+        }
+
 #if HAVE_SELINUX || ENABLE_SMACK
         /* Nodes in devtmpfs and /run need to be manually updated for
          * the appropriate labels, after mounting. The other virtual
-- 
2.36.1