diff -Naur dracut-059/dracut.conf.d/magellan.conf.example dracut-059.magellan/dracut.conf.d/magellan.conf.example --- dracut-059/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 +++ dracut-059.magellan/dracut.conf.d/magellan.conf.example 2023-07-27 11:20:46.870712937 +0200 @@ -0,0 +1,18 @@ +# dracut config file customized for RedHat/Fedora. + +# i18n +i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefonts:CONSOLEFONT" +i18n_default_font="LatArCyrHeb-16" +i18n_install_all="yes" +stdloglvl=3 +sysloglvl=5 +install_optional_items+=" nano /etc/nanorc lsmod ps grep cat rm " +prefix="/" +systemdutildir=/usr/lib/systemd +systemdsystemunitdir=/usr/lib/systemd/system +systemdsystemconfdir=/etc/systemd/system +udevdir=/usr/lib/udev +hostonly="yes" +hostonly_cmdline="no" +early_microcode="yes" +reproducible="yes" diff -Naur dracut-059/dracut-functions.sh dracut-059.magellan/dracut-functions.sh --- dracut-059/dracut-functions.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/dracut-functions.sh 2023-07-27 11:41:01.418174393 +0200 @@ -870,9 +870,9 @@ # follow ifcfg settings for boot protocol for dir in network-scripts network; do - [ -f "/etc/sysconfig/$dir/ifcfg-$ifname" ] && { + [ -f "/etc/conf.d/$dir/ifcfg-$ifname" ] && { sed -n "s/BOOTPROTO=[\"']\?\([[:alnum:]]\{1,\}\)[\"']\?.*\$/\1/p" \ - "/etc/sysconfig/$dir/ifcfg-$ifname" + "/etc/conf.d/$dir/ifcfg-$ifname" return } done diff -Naur dracut-059/dracut.logrotate dracut-059.magellan/dracut.logrotate --- dracut-059/dracut.logrotate 1970-01-01 01:00:00.000000000 +0100 +++ dracut-059.magellan/dracut.logrotate 2023-07-27 13:44:26.713016282 +0200 @@ -0,0 +1,6 @@ +/var/log/dracut.log { + missingok + notifyempty + size 30k + create 0600 root root +} diff -Naur dracut-059/Makefile dracut-059.magellan/Makefile --- dracut-059/Makefile 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/Makefile 2023-07-27 11:18:56.868818350 +0200 @@ -162,6 +162,9 @@ install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut install -m 0755 dracut-init.sh $(DESTDIR)$(pkglibdir)/dracut-init.sh install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh diff -Naur dracut-059/modules.d/10i18n/console_init.sh dracut-059.magellan/modules.d/10i18n/console_init.sh --- dracut-059/modules.d/10i18n/console_init.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/10i18n/console_init.sh 2023-07-27 11:20:23.513644284 +0200 @@ -8,8 +8,8 @@ [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf -DEFAULT_FONT=eurlatgr -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap +DEFAULT_FONT=LatArCyrHeb-16 +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap set_keyboard() { local param diff -Naur dracut-059/modules.d/35network-legacy/ifup.sh dracut-059.magellan/modules.d/35network-legacy/ifup.sh --- dracut-059/modules.d/35network-legacy/ifup.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/35network-legacy/ifup.sh 2023-07-27 11:21:55.848565895 +0200 @@ -386,15 +386,15 @@ unset TEAM_PORT_CONFIG read -r _hwaddr < "/sys/class/net/$slave/address" _subchannels=$(iface_get_subchannels "$slave") - if [ -n "$_hwaddr" ] && [ -e "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then + if [ -n "$_hwaddr" ] && [ -e "/etc/conf.dysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then # shellcheck disable=SC1090 - . "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" - elif [ -n "$_subchannels" ] && [ -e "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ]; then + . "/etc/conf.d/network-scripts/mac-${_hwaddr}.conf" + elif [ -n "$_subchannels" ] && [ -e "/etc/conf.d/network-scripts/ccw-${_subchannels}.conf" ]; then # shellcheck disable=SC1090 - . "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" - elif [ -e "/etc/sysconfig/network-scripts/ifcfg-${slave}" ]; then + . "/etc/conf.d/network-scripts/ccw-${_subchannels}.conf" + elif [ -e "/etc/conf.d/network-scripts/ifcfg-${slave}" ]; then # shellcheck disable=SC1090 - . "/etc/sysconfig/network-scripts/ifcfg-${slave}" + . "/etc/conf.d/network-scripts/ifcfg-${slave}" fi if [ -n "${TEAM_PORT_CONFIG}" ]; then diff -Naur dracut-059/modules.d/35network-legacy/module-setup.sh dracut-059.magellan/modules.d/35network-legacy/module-setup.sh --- dracut-059/modules.d/35network-legacy/module-setup.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/35network-legacy/module-setup.sh 2023-07-27 11:22:31.682515058 +0200 @@ -57,7 +57,7 @@ unset TEAM_PORT_CONFIG unset HWADDR unset SUBCHANNELS - for i in /etc/sysconfig/network-scripts/ifcfg-*; do + for i in /etc/conf.d/network-scripts/ifcfg-*; do [ -e "$i" ] || continue case "$i" in *~ | *.bak | *.orig | *.rpmnew | *.rpmorig | *.rpmsave) @@ -77,12 +77,12 @@ HWADDR="$(echo "$HWADDR" | sed 'y/ABCDEF/abcdef/')" if [ -n "$HWADDR" ]; then - ln_r "$i" "/etc/sysconfig/network-scripts/mac-${HWADDR}.conf" + ln_r "$i" "/etc/conf.d/network-scripts/mac-${HWADDR}.conf" fi SUBCHANNELS="$(echo "$SUBCHANNELS" | sed 'y/ABCDEF/abcdef/')" if [ -n "$SUBCHANNELS" ]; then - ln_r "$i" "/etc/sysconfig/network-scripts/ccw-${SUBCHANNELS}.conf" + ln_r "$i" "/etc/conf.d/network-scripts/ccw-${SUBCHANNELS}.conf" fi fi fi diff -Naur dracut-059/modules.d/35network-manager/nm-initrd.service dracut-059.magellan/modules.d/35network-manager/nm-initrd.service --- dracut-059/modules.d/35network-manager/nm-initrd.service 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/35network-manager/nm-initrd.service 2023-07-27 11:38:40.072426399 +0200 @@ -9,7 +9,7 @@ ConditionPathExistsGlob=|/usr/lib/NetworkManager/system-connections/* ConditionPathExistsGlob=|/run/NetworkManager/system-connections/* ConditionPathExistsGlob=|/etc/NetworkManager/system-connections/* -ConditionPathExistsGlob=|/etc/sysconfig/network-scripts/ifcfg-* +ConditionPathExistsGlob=|/etc/conf.d/network-scripts/ifcfg-* [Service] Type=dbus diff -Naur dracut-059/modules.d/35network-manager/nm-lib.sh dracut-059.magellan/modules.d/35network-manager/nm-lib.sh --- dracut-059/modules.d/35network-manager/nm-lib.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/35network-manager/nm-lib.sh 2023-07-27 11:40:41.661170246 +0200 @@ -18,7 +18,7 @@ for i in /usr/lib/NetworkManager/system-connections/* \ /run/NetworkManager/system-connections/* \ /etc/NetworkManager/system-connections/* \ - /etc/sysconfig/network-scripts/ifcfg-*; do + /etc/conf.d/network-scripts/ifcfg-*; do [ -f "$i" ] || continue mkdir -p "$hookdir"/initqueue/finished echo '[ -f /tmp/nm.done ]' > "$hookdir"/initqueue/finished/nm.sh diff -Naur dracut-059/modules.d/35network-manager/nm-run.sh dracut-059.magellan/modules.d/35network-manager/nm-run.sh --- dracut-059/modules.d/35network-manager/nm-run.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/35network-manager/nm-run.sh 2023-07-27 11:38:25.258839957 +0200 @@ -12,7 +12,7 @@ for i in /usr/lib/NetworkManager/system-connections/* \ /run/NetworkManager/system-connections/* \ /etc/NetworkManager/system-connections/* \ - /etc/sysconfig/network-scripts/ifcfg-*; do + /etc/conf.d/network-scripts/ifcfg-*; do [ -f "$i" ] || continue /usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon break diff -Naur dracut-059/modules.d/45ifcfg/module-setup.sh dracut-059.magellan/modules.d/45ifcfg/module-setup.sh --- dracut-059/modules.d/45ifcfg/module-setup.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/45ifcfg/module-setup.sh 2023-07-27 11:23:42.717068344 +0200 @@ -2,7 +2,7 @@ # called by dracut check() { - [[ -d $dracutsysrootdir/etc/sysconfig/network-scripts ]] && return 0 + [[ -d $dracutsysrootdir/etc/conf.d/network-scripts ]] && return 0 return 255 } diff -Naur dracut-059/modules.d/45ifcfg/write-ifcfg.sh dracut-059.magellan/modules.d/45ifcfg/write-ifcfg.sh --- dracut-059/modules.d/45ifcfg/write-ifcfg.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/45ifcfg/write-ifcfg.sh 2023-07-27 11:24:14.427612620 +0200 @@ -296,9 +296,9 @@ done # Pass network opts -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab echo "files /var/lib/dhclient" >> /run/initramfs/rwtab { cp /tmp/net.* /run/initramfs/ @@ -306,6 +306,6 @@ [ -f "$i" ] && cat "$i" done | awk '!($0 in a) { a[$0]; print }' > /run/initramfs/state/etc/resolv.conf [ -s /run/initramfs/state/etc/resolv.conf ] || rm -f /run/initramfs/state/etc/resolv.conf - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient } > /dev/null 2>&1 diff -Naur dracut-059/modules.d/80cms/cms-write-ifcfg.sh dracut-059.magellan/modules.d/80cms/cms-write-ifcfg.sh --- dracut-059/modules.d/80cms/cms-write-ifcfg.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/80cms/cms-write-ifcfg.sh 2023-07-27 11:25:16.302007437 +0200 @@ -4,7 +4,7 @@ OLD_UMASK=$(umask) umask 0022 -mkdir -p /run/initramfs/state/etc/sysconfig/network-scripts +mkdir -p /run/initramfs/state/etc/conf.d/network-scripts umask "$OLD_UMASK" function cms_write_config() { @@ -25,19 +25,19 @@ read -r uuid < /proc/sys/kernel/random/uuid - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE strglobin "$IPADDR" '*:*:*' && ipv6=1 # to please NetworkManager on startup in loader before loader reconfigures net - cat > /etc/sysconfig/network << EOF + cat > /etc/conf.d/network << EOF HOSTNAME=$HOSTNAME EOF echo "$HOSTNAME" > /etc/hostname if [ "$ipv6" ]; then - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network else - echo "NETWORKING=yes" >> /etc/sysconfig/network + echo "NETWORKING=yes" >> /etc/conf.d/network fi cat > "$IFCFGFILE" << EOF @@ -98,7 +98,7 @@ unset optstr unset DNS1 unset DNS2 - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab echo "files /var/lib/dhclient" >> /run/initramfs/rwtab } diff -Naur dracut-059/modules.d/95rootfs-block/mount-root.sh dracut-059.magellan/modules.d/95rootfs-block/mount-root.sh --- dracut-059/modules.d/95rootfs-block/mount-root.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/95rootfs-block/mount-root.sh 2023-07-27 11:26:22.799814234 +0200 @@ -32,9 +32,9 @@ READONLY= fsckoptions= - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then # shellcheck disable=SC1090 - . "$NEWROOT"/etc/sysconfig/readonly-root + . "$NEWROOT"/etc/conf.d/readonly-root fi if getargbool 0 "readonlyroot=" -y readonlyroot; then @@ -58,8 +58,8 @@ fsckoptions="-f $fsckoptions" elif [ -f "$NEWROOT"/.autofsck ]; then # shellcheck disable=SC1090 - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] \ - && . "$NEWROOT"/etc/sysconfig/autofsck + [ -f "$NEWROOT"/etc/conf.d/autofsck ] \ + && . "$NEWROOT"/etc/conf.d/autofsck if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then AUTOFSCK_OPT="$AUTOFSCK_OPT -f" fi diff -Naur dracut-059/modules.d/97masterkey/masterkey.sh dracut-059.magellan/modules.d/97masterkey/masterkey.sh --- dracut-059/modules.d/97masterkey/masterkey.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/97masterkey/masterkey.sh 2023-07-27 11:26:45.596871613 +0200 @@ -6,7 +6,7 @@ # TORSEC group -- http://security.polito.it # Roberto Sassu -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey" +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey" MULTIKERNELMODE="NO" PCRLOCKNUM=11 diff -Naur dracut-059/modules.d/97masterkey/README dracut-059.magellan/modules.d/97masterkey/README --- dracut-059/modules.d/97masterkey/README 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/97masterkey/README 2023-07-27 11:27:02.653830576 +0200 @@ -39,7 +39,7 @@ MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob" -------------------------------------------------------------------------- -2) create the configuration file '/etc/sysconfig/masterkey' to override the +2) create the configuration file '/etc/conf.d/masterkey' to override the value of one or all variables; 3) specify these parameters in the kernel command line: diff -Naur dracut-059/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-059.magellan/modules.d/98ecryptfs/ecryptfs-mount.sh --- dracut-059/modules.d/98ecryptfs/ecryptfs-mount.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2023-07-27 11:27:24.104198100 +0200 @@ -6,7 +6,7 @@ # TORSEC group -- http://security.polito.it # Roberto Sassu -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs" +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs" ECRYPTFSKEYTYPE="encrypted" ECRYPTFSKEYDESC="1000100010001000" ECRYPTFSKEYID="" diff -Naur dracut-059/modules.d/98ecryptfs/README dracut-059.magellan/modules.d/98ecryptfs/README --- dracut-059/modules.d/98ecryptfs/README 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/98ecryptfs/README 2023-07-27 11:31:35.291831476 +0200 @@ -23,13 +23,13 @@ ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob" -------------------------------------------------------------------------- -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY variable; 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command line. -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify # more options for mounting the eCryptfs filesystem: ECRYPTFSSRCDIR: existent directory in the lower root filesystem; @@ -39,7 +39,7 @@ option is automatically added by the dracut script). # Example of the configuration file: ------------ '/etc/sysconfig/ecryptfs' (with default values) ----------- +----------- '/etc/conf.d/ecryptfs' (with default values) ----------- ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob" ECRYPTFSSRCDIR="/secret" ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}" diff -Naur dracut-059/modules.d/98integrity/evm-enable.sh dracut-059.magellan/modules.d/98integrity/evm-enable.sh --- dracut-059/modules.d/98integrity/evm-enable.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/98integrity/evm-enable.sh 2023-07-27 11:32:11.222446098 +0200 @@ -7,13 +7,13 @@ # Roberto Sassu EVMSECFILE="${SECURITYFSDIR}/evm" -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm" +EVMCONFIG="${NEWROOT}/etc/conf.d/evm" EVMKEYDESC="evm-key" EVMKEYTYPE="encrypted" EVMKEYID="" EVM_ACTIVATION_BITS=0 -# The following variables can be set in /etc/sysconfig/evm: +# The following variables can be set in /etc/conf.d/evm: # EVMKEY: path to the symmetric key; defaults to /etc/keys/evm-trusted.blob # EVMKEYDESC: Description of the symmetric key; default is 'evm-key' # EVMKEYTYPE: Type of the symmetric key; default is 'encrypted' diff -Naur dracut-059/modules.d/98integrity/ima-keys-load.sh dracut-059.magellan/modules.d/98integrity/ima-keys-load.sh --- dracut-059/modules.d/98integrity/ima-keys-load.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/98integrity/ima-keys-load.sh 2023-07-27 11:32:29.959433238 +0200 @@ -2,7 +2,7 @@ SECURITYFSDIR="/sys/kernel/security" IMASECDIR="${SECURITYFSDIR}/ima" -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" +IMACONFIG="${NEWROOT}/etc/conf.d/ima" load_x509_keys() { KEYRING_ID=$1 diff -Naur dracut-059/modules.d/98integrity/ima-policy-load.sh dracut-059.magellan/modules.d/98integrity/ima-policy-load.sh --- dracut-059/modules.d/98integrity/ima-policy-load.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/98integrity/ima-policy-load.sh 2023-07-27 11:32:54.326516656 +0200 @@ -7,8 +7,8 @@ # Roberto Sassu IMASECDIR="${SECURITYFSDIR}/ima" -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" -IMAPOLICY="/etc/sysconfig/ima-policy" +IMACONFIG="${NEWROOT}/etc/conf.d/ima" +IMAPOLICY="/etc/conf.d/ima-policy" load_ima_policy() { # check kernel support for IMA diff -Naur dracut-059/modules.d/98integrity/README dracut-059.magellan/modules.d/98integrity/README --- dracut-059/modules.d/98integrity/README 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/98integrity/README 2023-07-27 11:33:30.390466717 +0200 @@ -20,7 +20,7 @@ EVMKEY="/etc/keys/evm-trusted.blob" -------------------------------------------------------------------------- -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable; +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable; 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command line. @@ -33,10 +33,10 @@ # Save the policy in a file. -# Create the configuration file '/etc/sysconfig/ima' to override the path name of +# Create the configuration file '/etc/conf.d/ima' to override the path name of # the IMA custom policy. -------------- '/etc/sysconfig/ima' (with the default value) ------------- -IMAPOLICY="/etc/sysconfig/ima-policy" +------------- '/etc/conf.d/ima' (with the default value) ------------- +IMAPOLICY="/etc/conf.d/ima-policy" ------------------------------------------------------------------------- @@ -64,5 +64,5 @@ # 98integrity/ima-keys-load.sh script loads the signed certificates stored # in the $IMAKEYSDIR onto the trusted IMA keyring. The default $IMAKEYSDIR -# directory is /etc/keys/ima, but can be specified in the /etc/sysconfig/ima +# directory is /etc/keys/ima, but can be specified in the /etc/conf.d/ima # policy. diff -Naur dracut-059/modules.d/98usrmount/mount-usr.sh dracut-059.magellan/modules.d/98usrmount/mount-usr.sh --- dracut-059/modules.d/98usrmount/mount-usr.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/modules.d/98usrmount/mount-usr.sh 2023-07-27 11:35:50.839534439 +0200 @@ -33,7 +33,7 @@ _fsckoptions="-f $_fsckoptions" elif [ -f "$NEWROOT"/.autofsck ]; then # shellcheck disable=SC1090 - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then AUTOFSCK_OPT="$AUTOFSCK_OPT -f" fi diff -Naur dracut-059/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh dracut-059.magellan/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh --- dracut-059/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh 2023-07-27 11:38:58.126068175 +0200 @@ -11,7 +11,7 @@ ( echo OK ip -o -4 address show scope global | while read -r _ if rest; do echo "$if"; done | sort - for i in /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-*; do + for i in /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-*; do echo "$i" grep -v 'UUID=' "$i" done diff -Naur dracut-059/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh dracut-059.magellan/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh --- dracut-059/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh 2022-12-24 17:49:27.000000000 +0100 +++ dracut-059.magellan/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh 2023-07-27 11:40:23.290856440 +0200 @@ -135,9 +135,9 @@ test_client() { if [[ $NM ]]; then - EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-* EOF ' + EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-* EOF ' else - EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" DEVICE="net1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net3.0004 # Generated by dracut initrd NAME="net3.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="net3.0004" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net3.3 # Generated by dracut initrd NAME="net3.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="net3.3" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan0001 # Generated by dracut initrd NAME="vlan0001" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.54.101" PREFIX="24" GATEWAY="192.168.54.1" TYPE=Vlan DEVICE="vlan0001" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan2 # Generated by dracut initrd NAME="vlan2" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.55.102" PREFIX="24" GATEWAY="192.168.55.1" TYPE=Vlan DEVICE="vlan2" VLAN=yes PHYSDEV="net3" EOF ' + EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" DEVICE="net1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net3.0004 # Generated by dracut initrd NAME="net3.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="net3.0004" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net3.3 # Generated by dracut initrd NAME="net3.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="net3.3" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-vlan0001 # Generated by dracut initrd NAME="vlan0001" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.54.101" PREFIX="24" GATEWAY="192.168.54.1" TYPE=Vlan DEVICE="vlan0001" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-vlan2 # Generated by dracut initrd NAME="vlan2" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.55.102" PREFIX="24" GATEWAY="192.168.55.1" TYPE=Vlan DEVICE="vlan2" VLAN=yes PHYSDEV="net3" EOF ' fi client_test "Multiple VLAN" \ @@ -159,9 +159,9 @@ || return 1 if [[ $NM ]]; then - EXPECT='bond0 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-* EOF ' + EXPECT='bond0 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-* EOF ' else - EXPECT='bond0 bond1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond0 # Generated by dracut initrd NAME="bond0" DEVICE="bond0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond0" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond1 # Generated by dracut initrd NAME="bond1" DEVICE="bond1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond1" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="net1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net2 # Generated by dracut initrd NAME="net2" HWADDR="52:54:00:12:34:02" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="net2" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net4 # Generated by dracut initrd NAME="net4" HWADDR="52:54:00:12:34:04" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="net4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net5 # Generated by dracut initrd NAME="net5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="net5" EOF ' + EXPECT='bond0 bond1 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-bond0 # Generated by dracut initrd NAME="bond0" DEVICE="bond0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond0" TYPE=Bond /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-bond1 # Generated by dracut initrd NAME="bond1" DEVICE="bond1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond1" TYPE=Bond /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="net1" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net2 # Generated by dracut initrd NAME="net2" HWADDR="52:54:00:12:34:02" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="net2" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net4 # Generated by dracut initrd NAME="net4" HWADDR="52:54:00:12:34:04" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="net4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net5 # Generated by dracut initrd NAME="net5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="net5" EOF ' fi client_test "Multiple Bonds" \ @@ -178,9 +178,9 @@ || return 1 if [[ $NM ]]; then - EXPECT='br0 br1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-* EOF ' + EXPECT='br0 br1 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-* EOF ' else - EXPECT='br0 br1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br0 # Generated by dracut initrd NAME="br0" DEVICE="br0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br0" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br1 # Generated by dracut initrd NAME="br1" DEVICE="br1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="net1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net2 # Generated by dracut initrd NAME="net2" HWADDR="52:54:00:12:34:02" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="net2" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net4 # Generated by dracut initrd NAME="net4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="net4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net5 # Generated by dracut initrd NAME="net5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="net5" EOF ' + EXPECT='br0 br1 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-br0 # Generated by dracut initrd NAME="br0" DEVICE="br0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br0" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-br1 # Generated by dracut initrd NAME="br1" DEVICE="br1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br1" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="net1" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net2 # Generated by dracut initrd NAME="net2" HWADDR="52:54:00:12:34:02" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="net2" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net4 # Generated by dracut initrd NAME="net4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="net4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net5 # Generated by dracut initrd NAME="net5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="net5" EOF ' fi client_test "Multiple Bridges" \