From: Harald Hoyer <harald@redhat.com>
Date: Thu, 19 Mar 2015 09:00:48 +0000 (+0100)
Subject: base/module-setup.sh: merge systemd conditional
X-Git-Tag: 042~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=363469d757a00b5a7142235433a973b2d1be2309;p=thirdparty%2Fdracut.git

base/module-setup.sh: merge systemd conditional
---

diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
index a1046af80..fd65cdf6c 100755
--- a/modules.d/99base/module-setup.sh
+++ b/modules.d/99base/module-setup.sh
@@ -43,15 +43,11 @@ install() {
     mkdir -p ${initdir}/tmp
 
     inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
+    mkdir -p "${initdir}/var"
 
     if ! dracut_module_included "systemd"; then
         inst_multiple switch_root || dfatal "Failed to install switch_root"
         inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
-    fi
-
-    mkdir -p "${initdir}/var"
-
-    if ! dracut_module_included "systemd"; then
         inst_multiple -o $systemdutildir/systemd-timestamp
     fi