From: Harald Hoyer <harald@redhat.com>
Date: Fri, 22 Mar 2013 08:09:10 +0000 (+0100)
Subject: dracut.sh: export systemdsystemconfdir
X-Git-Tag: 027~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb8def95c42c90b07d737f303458731840e2da1f;p=thirdparty%2Fdracut.git

dracut.sh: export systemdsystemconfdir
---

diff --git a/dracut.sh b/dracut.sh
index 0a87cca3b..ecd323741 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -892,23 +892,30 @@ fi
 
 [[ -d $systemdutildir ]] \
     || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null)
-[[ -d $systemdsystemunitdir ]] \
-    || systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2>/dev/null)
 
 if ! [[ -d "$systemdutildir" ]]; then
     [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd
     [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd
 fi
+
+[[ -d $systemdsystemunitdir ]] \
+    || systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2>/dev/null)
+
 [[ -d "$systemdsystemunitdir" ]] || systemdsystemunitdir=${systemdutildir}/system
 
+[[ -d $systemdsystemconfdir ]] \
+    || systemdsystemconfdir=$(pkg-config systemd --variable=systemdsystemconfdir 2>/dev/null)
+
+[[ -d "$systemdsystemconfdir" ]] || systemdsystemconfdir=/etc/systemd/system
+
 export initdir dracutbasedir dracutmodules \
     fw_dir drivers_dir debug no_kernel kernel_only \
     omit_drivers mdadmconf lvmconf \
     use_fstab fstab_lines libdirs fscks nofscks ro_mnt \
     stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
     debug host_fs_types host_devs sshkey add_fstab \
-    DRACUT_VERSION udevdir systemdutildir systemdsystemunitdir \
-    prefix filesystems drivers
+    DRACUT_VERSION udevdir prefix filesystems drivers \
+    systemdutildir systemdsystemunitdir systemdsystemconfdir
 
 # Create some directory structure first
 [[ $prefix ]] && mkdir -m 0755 -p "${initdir}${prefix}"