From: Harald Hoyer <harald@redhat.com>
Date: Mon, 27 Jun 2016 10:03:55 +0000 (+0200)
Subject: fcoe/cleanup-fcoe.sh: don't copy shm files to state
X-Git-Tag: 045~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8242a6a60c0cf5fb0cd51261f9b6c8570dc3031;p=thirdparty%2Fdracut.git

fcoe/cleanup-fcoe.sh: don't copy shm files to state

with systemd version 230, this is not necessary anymore
systemd commit cacf980ed44a28e276a6cc7f8fc41f991e2ab354
because /dev/shm is selinux relabled.
---

diff --git a/modules.d/95fcoe/cleanup-fcoe.sh b/modules.d/95fcoe/cleanup-fcoe.sh
index 5ff4d054c..1872156ec 100644
--- a/modules.d/95fcoe/cleanup-fcoe.sh
+++ b/modules.d/95fcoe/cleanup-fcoe.sh
@@ -4,7 +4,11 @@
 
 if [ -e /var/run/lldpad.pid ]; then
     lldpad -k
-    mkdir -m 0755 -p /run/initramfs/state/dev/shm
-    cp /dev/shm/lldpad.state /run/initramfs/state/dev/shm/ > /dev/null 2>&1
-    echo "files /dev/shm/lldpad.state" >> /run/initramfs/rwtab
+    # with systemd version 230, this is not necessary anymore
+    # systemd commit cacf980ed44a28e276a6cc7f8fc41f991e2ab354
+    if [ -z "$DRACUT_SYSTEMD" ]; then
+        mkdir -m 0755 -p /run/initramfs/state/dev/shm
+        cp /dev/shm/lldpad.state /run/initramfs/state/dev/shm/ > /dev/null 2>&1
+        echo "files /dev/shm/lldpad.state" >> /run/initramfs/rwtab
+    fi
 fi