+-[[ -d $dracutsysrootdir$systemdutilconfdir ]] \
+- || systemdutilconfdir=$(pkg-config systemd --variable=systemdutilconfdir 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$systemdutilconfdir ]] || systemdutilconfdir=/etc/systemd
+-
+ if [[ $no_kernel != yes ]] && [[ -d $srcmods ]]; then
+ if ! [[ -f $srcmods/modules.dep ]]; then
+ if [[ -n "$(find "$srcmods" -name '*.ko*')" ]]; then
+@@ -1467,10 +1447,6 @@ if [[ ! $print_cmdline ]]; then
+ esac
+
+ if ! [[ -s $uefi_stub ]]; then
+- uefi_stub="$dracutsysrootdir${systemdutildir}/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
+- fi
+-
+- if ! [[ -s $uefi_stub ]]; then
+ dfatal "Can't find a uefi stub '$uefi_stub' to create a UEFI executable"
+ exit 1
+ fi
+@@ -1722,66 +1698,6 @@ for dev in "${!host_fs_types[@]}"; do
+ fi
+ done
+
+-[[ -d $dracutsysrootdir$dbus ]] \
+- || dbus=$(pkg-config dbus --variable=dbus 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbus ]] || dbus=/usr/share/dbus-1
+-
+-[[ -d $dracutsysrootdir$dbusconfdir ]] \
+- || dbusconfdir=$(pkg-config dbus --variable=dbusconfdir 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbusconfdir ]] || dbusconfdir=/etc/dbus-1
+-
+-[[ -d $dracutsysrootdir$dbusinterfaces ]] \
+- || dbusinterfaces=$(pkg-config dbus --variable=dbusinterfaces 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbusinterfaces ]] || dbusinterfaces=${dbus}/interfaces
+-
+-[[ -d $dracutsysrootdir$dbusinterfacesconfdir ]] \
+- || dbusinterfacesconfdir=$(pkg-config dbus --variable=dbusinterfacesconfdir 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbusinterfacesconfdir ]] || dbusinterfacesconfdir=${dbusconfdir}/interfaces
+-
+-[[ -d $dracutsysrootdir$dbusservices ]] \
+- || dbusservices=$(pkg-config dbus --variable=dbusservices 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbusservices ]] || dbusservices=${dbus}/services
+-
+-[[ -d $dracutsysrootdir$dbusservicesconfdir ]] \
+- || dbusservicesconfdir=$(pkg-config dbus --variable=dbusservicesconfdir 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbusservicesconfdir ]] || dbusservicesconfdir=${dbusconfdir}/services
+-
+-[[ -d $dracutsysrootdir$dbussession ]] \
+- || dbussession=$(pkg-config dbus --variable=dbussession 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbussession ]] || dbussession=${dbus}/session.d
+-
+-[[ -d $dracutsysrootdir$dbussessionconfdir ]] \
+- || dbussessionconfdir=$(pkg-config dbus --variable=dbussessionconfdir 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbussessionconfdir ]] || dbussessionconfdir=${dbusconfdir}/session.d
+-
+-[[ -d $dracutsysrootdir$dbussystem ]] \
+- || dbussystem=$(pkg-config dbus --variable=dbussystem 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbussystem ]] || dbussystem=${dbus}/system.d
+-
+-[[ -d $dracutsysrootdir$dbussystemconfdir ]] \
+- || dbussystemconfdir=$(pkg-config dbus --variable=dbussystemconfdir 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbussystemconfdir ]] || dbussystemconfdir=${dbusconfdir}/system.d
+-
+-[[ -d $dracutsysrootdir$dbussystemservices ]] \
+- || dbussystemservices=$(pkg-config dbus --variable=dbussystemservices 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbussystemservices ]] || dbussystemservices=${dbus}/system-services
+-
+-[[ -d $dracutsysrootdir$dbussystemservicesconfdir ]] \
+- || dbussystemservicesconfdir=$(pkg-config dbus --variable=dbussystemservicesconfdir 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$dbussystemservicesconfdir ]] || dbussystemservicesconfdir=${dbusconfdir}/system-services
+-
+ [[ -d $dracutsysrootdir$udevdir ]] \
+ || udevdir="$(pkg-config udev --variable=udevdir 2> /dev/null)"
+ if ! [[ -d $dracutsysrootdir$udevdir ]]; then
+@@ -1804,114 +1720,22 @@ fi
+
+ [[ -d $dracutsysrootdir$udevrulesconfdir ]] || udevrulesconfdir=${udevconfdir}/rules.d
+
+-[[ -d $dracutsysrootdir$sysctld ]] \
+- || sysctld=$(pkg-config systemd --variable=sysctld 2> /dev/null)
+-
+ [[ -d $dracutsysrootdir$sysctld ]] || sysctld=/usr/lib/sysctl.d
+
+-[[ -d $dracutsysrootdir$sysctlconfdir ]] \
+- || sysctlconfdir=$(pkg-config systemd --variable=sysctlconfdir 2> /dev/null)
+-
+ [[ -d $dracutsysrootdir$sysctlconfdir ]] || sysctlconfdir=/etc/sysctl.d
+
+-[[ -d $dracutsysrootdir$environment ]] \
+- || environment=$(pkg-config systemd --variable=environment 2> /dev/null)
+-
+ [[ -d $dracutsysrootdir$environment ]] || environment=/usr/lib/environment.d
+
+-[[ -d $dracutsysrootdir$environmentconfdir ]] \
+- || environmentconfdir=$(pkg-config systemd --variable=environmentconfdir 2> /dev/null)
+-
+ [[ -d $dracutsysrootdir$environmentconfdir ]] || environmentconfdir=/etc/environment.d
+
+-[[ -d $dracutsysrootdir$systemdcatalog ]] \
+- || systemdcatalog=$(pkg-config systemd --variable=systemdcatalog 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$systemdcatalog ]] || systemdcatalog=${systemdutildir}/catalog
+-
+-[[ -d $dracutsysrootdir$modulesload ]] \
+- || modulesload=$(pkg-config systemd --variable=modulesload 2> /dev/null)
+-
+ [[ -d $dracutsysrootdir$modulesload ]] || modulesload=/usr/lib/modules-load.d
+
+-[[ -d $dracutsysrootdir$modulesloadconfdir ]] \
+- || modulesloadconfdir=$(pkg-config systemd --variable=modulesloadconfdir 2> /dev/null)
+-
+ [[ -d $dracutsysrootdir$modulesloadconfdir ]] || modulesloadconfdir=/etc/modules-load.d
+
+-[[ -d $dracutsysrootdir$systemdnetwork ]] \
+- || systemdnetwork=$(pkg-config systemd --variable=systemdnetwork 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$systemdnetwork ]] || systemdnetwork=${systemdutildir}/network
+-
+-[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] \
+- || systemdnetworkconfdir=$(pkg-config systemd --variable=systemdnetworkconfdir 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] || systemdnetworkconfdir=${systemdutilconfdir}/network
+-
+-[[ -d $dracutsysrootdir$systemdntpunits ]] \
+- || systemdntpunits=$(pkg-config systemd --variable=systemdntpunits 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$systemdntpunits ]] || systemdntpunits=${systemdutildir}/ntp-units.d
+-
+-[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] \
+- || systemdntpunitsconfdir=$(pkg-config systemd --variable=systemdntpunitsconfdir 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] || systemdntpunitsconfdir=${systemdutilconfdir}/ntp-units.d
+-
+-[[ -d $dracutsysrootdir$systemdportable ]] \
+- || systemdportable=$(pkg-config systemd --variable=systemdportable 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$systemdportable ]] || systemdportable=${systemdutildir}/portable
+-
+-[[ -d $dracutsysrootdir$systemdportableconfdir ]] \
+- || systemdportableconfdir=$(pkg-config systemd --variable=systemdportableconfdir 2> /dev/null)
+-
+-[[ -d "$dracutsysrootdir$systemdportableconfdir" ]] || systemdportableconfdir=${systemdutilconfdir}/portable
+-
+-[[ -d $dracutsysrootdir$systemdsystemunitdir ]] \
+- || systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2> /dev/null)
+-
+-[[ -d "$dracutsysrootdir$systemdsystemunitdir" ]] || systemdsystemunitdir=${systemdutildir}/system
+-
+-[[ -d $dracutsysrootdir$systemduser ]] \
+- || systemduser=$(pkg-config systemd --variable=systemduser 2> /dev/null)
+-
+-[[ -d $dracutsysrootdir$systemduser ]] || systemduser=${systemdutildir}/user