|
1833 | 1833 | [[ -d $dracutsysrootdir$systemdnetworkconfdir ]] \
|
1834 | 1834 | || systemdnetworkconfdir=$(pkg-config systemd --variable=systemdnetworkconfdir 2> /dev/null)
|
1835 | 1835 |
|
1836 |
| -[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] || systemdnetworkconfdir=${systemdsystemconfdir}/network |
| 1836 | +[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] || systemdnetworkconfdir=${systemdutilconfdir}/network |
1837 | 1837 |
|
1838 | 1838 | [[ -d $dracutsysrootdir$systemdntpunits ]] \
|
1839 | 1839 | || systemdntpunits=$(pkg-config systemd --variable=systemdntpunits 2> /dev/null)
|
|
1843 | 1843 | [[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] \
|
1844 | 1844 | || systemdntpunitsconfdir=$(pkg-config systemd --variable=systemdntpunitsconfdir 2> /dev/null)
|
1845 | 1845 |
|
1846 |
| -[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] || systemdntpunitsconfdir=${systemdsystemconfdir}/ntp-units.d |
| 1846 | +[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] || systemdntpunitsconfdir=${systemdutilconfdir}/ntp-units.d |
1847 | 1847 |
|
1848 | 1848 | [[ -d $dracutsysrootdir$systemdportable ]] \
|
1849 | 1849 | || systemdportable=$(pkg-config systemd --variable=systemdportable 2> /dev/null)
|
|
1853 | 1853 | [[ -d $dracutsysrootdir$systemdportableconfdir ]] \
|
1854 | 1854 | || systemdportableconfdir=$(pkg-config systemd --variable=systemdportableconfdir 2> /dev/null)
|
1855 | 1855 |
|
1856 |
| -[[ -d "$dracutsysrootdir$systemdportableconfdir" ]] || systemdportableconfdir=${systemdsystemconfdir}/portable |
| 1856 | +[[ -d "$dracutsysrootdir$systemdportableconfdir" ]] || systemdportableconfdir=${systemdutilconfdir}/portable |
1857 | 1857 |
|
1858 | 1858 | [[ -d $dracutsysrootdir$systemdsystemunitdir ]] \
|
1859 | 1859 | || systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2> /dev/null)
|
|
1868 | 1868 | [[ -d $dracutsysrootdir$systemduserconfdir ]] \
|
1869 | 1869 | || systemduserconfdir=$(pkg-config systemd --variable=systemduserconfdir 2> /dev/null)
|
1870 | 1870 |
|
1871 |
| -[[ -d $dracutsysrootdir$systemduserconfdir ]] || systemduserconfdir=${systemdsystemconfdir}/user |
| 1871 | +[[ -d $dracutsysrootdir$systemduserconfdir ]] || systemduserconfdir=${systemdutilconfdir}/user |
1872 | 1872 |
|
1873 | 1873 | [[ -d $dracutsysrootdir$systemdsystemconfdir ]] \
|
1874 | 1874 | || systemdsystemconfdir=$(pkg-config systemd --variable=systemdsystemconfdir 2> /dev/null)
|
@@ -1922,8 +1922,10 @@ export initdir dracutbasedir \
|
1922 | 1922 | dbussessionconfdir dbussystem dbussystemconfdir dbussystemservices \
|
1923 | 1923 | dbussystemservicesconfdir environment environmentconfdir modulesload \
|
1924 | 1924 | modulesloadconfdir sysctld sysctlconfdir sysusers sysusersconfdir \
|
1925 |
| - systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \ |
1926 |
| - systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \ |
| 1925 | + systemdutildir systemdutilconfdir systemdcatalog systemdnetwork \ |
| 1926 | + systemdnetworkconfdir systemdntpunits systemdntpunitsconfdir \ |
| 1927 | + systemdportable systemdportableconfdir systemdsystemunitdir \ |
| 1928 | + systemdsystemconfdir systemduser systemduserconfdir \ |
1927 | 1929 | hostonly_cmdline loginstall tmpfilesdir tmpfilesconfdir depmodd \
|
1928 | 1930 | depmodconfdir
|
1929 | 1931 |
|
|
0 commit comments