From cb8def95c42c90b07d737f303458731840e2da1f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 22 Mar 2013 09:09:10 +0100 Subject: [PATCH] dracut.sh: export systemdsystemconfdir --- dracut.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dracut.sh b/dracut.sh index 0a87cca3..ecd32374 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}"