diff -Naur dracut-049/dracut.conf.d/magellan.conf.example dracut-049-magellan/dracut.conf.d/magellan.conf.example --- dracut-049/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 +++ dracut-049-magellan/dracut.conf.d/magellan.conf.example 2019-07-08 14:59:29.773372227 +0200 @@ -0,0 +1,18 @@ +# dracut config file customized for Magellan-Linux + +# i18n +i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefonts:CONSOLEFONT" +i18n_default_font="latarcyrheb-sun16" +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-049/Makefile dracut-049-magellan/Makefile --- dracut-049/Makefile 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/Makefile 2019-07-08 15:00:38.576424992 +0200 @@ -126,6 +126,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-049/modules.d/10i18n/console_init.sh dracut-049-magellan/modules.d/10i18n/console_init.sh --- dracut-049/modules.d/10i18n/console_init.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/10i18n/console_init.sh 2019-07-08 15:01:13.162948270 +0200 @@ -9,7 +9,7 @@ [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf DEFAULT_FONT=LatArCyrHeb-16 -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap set_keyboard() { local param diff -Naur dracut-049/modules.d/35network-legacy/ifup.sh dracut-049-magellan/modules.d/35network-legacy/ifup.sh --- dracut-049/modules.d/35network-legacy/ifup.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/35network-legacy/ifup.sh 2019-07-08 15:02:22.722988441 +0200 @@ -327,12 +327,12 @@ unset TEAM_PORT_CONFIG _hwaddr=$(cat /sys/class/net/$slave/address) _subchannels=$(iface_get_subchannels "$slave") - if [ -n "$_hwaddr" ] && [ -e "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then - . "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" - elif [ -n "$_subchannels" ] && [ -e "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ]; then - . "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" - elif [ -e "/etc/sysconfig/network-scripts/ifcfg-${slave}" ]; then - . "/etc/sysconfig/network-scripts/ifcfg-${slave}" + if [ -n "$_hwaddr" ] && [ -e "/etc/conf.d/network-scripts/mac-${_hwaddr}.conf" ]; then + . "/etc/conf.d/network-scripts/mac-${_hwaddr}.conf" + elif [ -n "$_subchannels" ] && [ -e "/etc/conf.d/network-scripts/ccw-${_subchannels}.conf" ]; then + . "/etc/conf.d/network-scripts/ccw-${_subchannels}.conf" + elif [ -e "/etc/conf.d/network-scripts/ifcfg-${slave}" ]; then + . "/etc/conf.d/network-scripts/ifcfg-${slave}" fi if [ -n "${TEAM_PORT_CONFIG}" ]; then diff -Naur dracut-049/modules.d/35network-legacy/module-setup.sh dracut-049-magellan/modules.d/35network-legacy/module-setup.sh --- dracut-049/modules.d/35network-legacy/module-setup.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/35network-legacy/module-setup.sh 2019-07-08 15:02:54.997542679 +0200 @@ -52,7 +52,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) @@ -71,12 +71,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-049/modules.d/35network-manager/module-setup.sh dracut-049-magellan/modules.d/35network-manager/module-setup.sh --- dracut-049/modules.d/35network-manager/module-setup.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/35network-manager/module-setup.sh 2019-07-08 15:04:35.775149232 +0200 @@ -46,7 +46,7 @@ # We don't install the ifcfg files from the host automatically. # But if the user chooses to include them, we pull in the machinery to read them. - if ! [[ -d "$initdir/etc/sysconfig/network-scripts" ]]; then + if ! [[ -d "$initdir/etc/conf.d/network-scripts" ]]; then inst_libdir_file "NetworkManager/$_nm_version/libnm-settings-plugin-ifcfg-rh.so" fi } diff -Naur dracut-049/modules.d/45ifcfg/module-setup.sh dracut-049-magellan/modules.d/45ifcfg/module-setup.sh --- dracut-049/modules.d/45ifcfg/module-setup.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/45ifcfg/module-setup.sh 2019-07-08 15:03:28.159084394 +0200 @@ -2,7 +2,7 @@ # called by dracut check() { - [[ -d /etc/sysconfig/network-scripts ]] && return 0 + [[ -d /etc/conf.d/network-scripts ]] && return 0 return 255 } diff -Naur dracut-049/modules.d/45ifcfg/write-ifcfg.sh dracut-049-magellan/modules.d/45ifcfg/write-ifcfg.sh --- dracut-049/modules.d/45ifcfg/write-ifcfg.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/45ifcfg/write-ifcfg.sh 2019-07-08 15:03:58.345667018 +0200 @@ -280,9 +280,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/ @@ -290,6 +290,6 @@ [ -f "$i" ] && cat "$i" done | sort -u > /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-049/modules.d/80cms/cms-write-ifcfg.sh dracut-049-magellan/modules.d/80cms/cms-write-ifcfg.sh --- dracut-049/modules.d/80cms/cms-write-ifcfg.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/80cms/cms-write-ifcfg.sh 2019-07-08 15:05:18.088563552 +0200 @@ -2,7 +2,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts function cms_write_config() { @@ -23,19 +23,19 @@ uuid=$(cat /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 @@ -97,7 +97,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-049/modules.d/95iscsi/module-setup.sh dracut-049-magellan/modules.d/95iscsi/module-setup.sh --- dracut-049/modules.d/95iscsi/module-setup.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/95iscsi/module-setup.sh 2019-07-08 15:05:54.345061449 +0200 @@ -119,7 +119,7 @@ ifname=$(ip -o route get to $iscsi_address | sed -n 's/.*dev \([^ ]*\).*/\1/p') #follow ifcfg settings for boot protocol - bootproto=$(sed -n "/BOOTPROTO/s/BOOTPROTO='\([[:alpha:]]*6\?\)4\?'/\1/p" /etc/sysconfig/network/ifcfg-$ifname) + bootproto=$(sed -n "/BOOTPROTO/s/BOOTPROTO='\([[:alpha:]]*6\?\)4\?'/\1/p" /etc/conf.d/network/ifcfg-$ifname) if [ $bootproto ]; then printf 'ip=%s:%s ' ${ifname} ${bootproto} else diff -Naur dracut-049/modules.d/95rootfs-block/mount-root.sh dracut-049-magellan/modules.d/95rootfs-block/mount-root.sh --- dracut-049/modules.d/95rootfs-block/mount-root.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/95rootfs-block/mount-root.sh 2019-07-08 15:06:19.067718939 +0200 @@ -33,8 +33,8 @@ READONLY= fsckoptions= - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then - . "$NEWROOT"/etc/sysconfig/readonly-root + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then + . "$NEWROOT"/etc/conf.d/readonly-root fi if getargbool 0 "readonlyroot=" -y readonlyroot; then @@ -57,8 +57,8 @@ if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then fsckoptions="-f $fsckoptions" elif [ -f "$NEWROOT"/.autofsck ]; then - [ -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-049/modules.d/97masterkey/masterkey.sh dracut-049-magellan/modules.d/97masterkey/masterkey.sh --- dracut-049/modules.d/97masterkey/masterkey.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/97masterkey/masterkey.sh 2019-07-08 15:07:06.881056289 +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-049/modules.d/97masterkey/README dracut-049-magellan/modules.d/97masterkey/README --- dracut-049/modules.d/97masterkey/README 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/97masterkey/README 2019-07-08 15:06:47.965318481 +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-049/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-049-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh --- dracut-049/modules.d/98ecryptfs/ecryptfs-mount.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2019-07-08 15:07:48.017485875 +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-049/modules.d/98ecryptfs/README dracut-049-magellan/modules.d/98ecryptfs/README --- dracut-049/modules.d/98ecryptfs/README 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/98ecryptfs/README 2019-07-08 15:07:33.903681615 +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-049/modules.d/98integrity/evm-enable.sh dracut-049-magellan/modules.d/98integrity/evm-enable.sh --- dracut-049/modules.d/98integrity/evm-enable.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/98integrity/evm-enable.sh 2019-07-08 15:09:21.411065286 +0200 @@ -7,7 +7,7 @@ # Roberto Sassu EVMSECFILE="${SECURITYFSDIR}/evm" -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm" +EVMCONFIG="${NEWROOT}/etc/conf.d/evm" EVMKEYDESC="evm-key" EVMKEYTYPE="encrypted" EVMKEYID="" diff -Naur dracut-049/modules.d/98integrity/ima-keys-load.sh dracut-049-magellan/modules.d/98integrity/ima-keys-load.sh --- dracut-049/modules.d/98integrity/ima-keys-load.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/98integrity/ima-keys-load.sh 2019-07-08 15:09:34.153864137 +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() { diff -Naur dracut-049/modules.d/98integrity/ima-policy-load.sh dracut-049-magellan/modules.d/98integrity/ima-policy-load.sh --- dracut-049/modules.d/98integrity/ima-policy-load.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/98integrity/ima-policy-load.sh 2019-07-08 15:09:08.830264385 +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() { diff -Naur dracut-049/modules.d/98integrity/README dracut-049-magellan/modules.d/98integrity/README --- dracut-049/modules.d/98integrity/README 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/98integrity/README 2019-07-08 15:08:21.529017700 +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-049/modules.d/98usrmount/mount-usr.sh dracut-049-magellan/modules.d/98usrmount/mount-usr.sh --- dracut-049/modules.d/98usrmount/mount-usr.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/modules.d/98usrmount/mount-usr.sh 2019-07-08 15:09:55.093534710 +0200 @@ -32,7 +32,7 @@ if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then _fsckoptions="-f $_fsckoptions" elif [ -f "$NEWROOT"/.autofsck ]; then - [ -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-049/test/TEST-04-FULL-SYSTEMD/test.sh dracut-049-magellan/test/TEST-04-FULL-SYSTEMD/test.sh --- dracut-049/test/TEST-04-FULL-SYSTEMD/test.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/test/TEST-04-FULL-SYSTEMD/test.sh 2019-07-08 15:10:48.450701082 +0200 @@ -87,7 +87,7 @@ inst /lib/systemd/system/systemd-remount-fs.service inst /lib/systemd/systemd-remount-fs inst /lib/systemd/system/systemd-journal-flush.service - inst /etc/sysconfig/init + inst /etc/conf.d/init inst /lib/systemd/system/slices.target inst /lib/systemd/system/system.slice inst_multiple -o /lib/systemd/system/dracut* @@ -99,7 +99,7 @@ inst_multiple -o \ /etc/machine-id \ /etc/adjtime \ - /etc/sysconfig/init \ + /etc/conf.d/init \ /etc/passwd \ /etc/shadow \ /etc/group \ diff -Naur dracut-049/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh dracut-049-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh --- dracut-049/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh 2019-07-08 15:12:22.692247007 +0200 @@ -11,7 +11,7 @@ ( echo OK ip -o -4 address show scope global | while read n 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-049/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh dracut-049-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh --- dracut-049/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh 2018-10-08 15:38:33.000000000 +0200 +++ dracut-049-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh 2019-07-08 15:12:08.506464512 +0200 @@ -150,7 +150,7 @@ rd.neednet=1 root=nfs:192.168.50.1:/nfs/client bootdev=ens3 " \ - 'ens3 ens5.0004 ens5.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens3 # Generated by dracut initrd NAME="ens3" DEVICE="ens3" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5.0004 # Generated by dracut initrd NAME="ens5.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="ens5.0004" VLAN=yes PHYSDEV="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5.3 # Generated by dracut initrd NAME="ens5.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="ens5.3" VLAN=yes PHYSDEV="ens5" /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="ens5" /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="ens5" EOF ' \ + 'ens3 ens5.0004 ens5.3 vlan0001 vlan2 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens3 # Generated by dracut initrd NAME="ens3" DEVICE="ens3" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens5.0004 # Generated by dracut initrd NAME="ens5.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="ens5.0004" VLAN=yes PHYSDEV="ens5" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens5.3 # Generated by dracut initrd NAME="ens5.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="ens5.3" VLAN=yes PHYSDEV="ens5" /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="ens5" /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="ens5" EOF ' \ || return 1 client_test "Multiple Bonds" \ @@ -163,7 +163,7 @@ rd.neednet=1 root=nfs:192.168.50.1:/nfs/client bootdev=bond0 " \ - '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-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens6" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens7" EOF ' \ + '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-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens5" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens6" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens7" EOF ' \ || return 1 client_test "Multiple Bridges" \ @@ -176,7 +176,7 @@ rd.neednet=1 root=nfs:192.168.50.1:/nfs/client bootdev=br0 " \ - '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-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens6" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens7" EOF ' \ + '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-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens5" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens6" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens7" EOF ' \ || return 1 kill_server