chore!: drop support for ifcfg

Skip test 60 if ifcfg can not be installed as test 60 still
needs ifcfg dracut module.

diff --git a/modules.d/45ifcfg/module-setup.sh b/modules.d/45ifcfg/module-setup.sh
deleted file mode 100755 (executable)
index cf731be..0000000
--- a/modules.d/45ifcfg/module-setup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# This module is deprecated. Modern replacements are NetworkManager keyfiles and
-# systemd network files. It must now be explicitly opted in by the user to be
-# added to the initrd.
-
-# called by dracut
-check() {
-    return 255
-}
-
-# called by dracut
-depends() {
-    echo "network"
-    return 0
-}
-
-# called by dracut
-install() {
-    inst_binary awk
-    inst_hook pre-pivot 85 "$moddir/write-ifcfg.sh"
-}

diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
deleted file mode 100755 (executable)
index a7804b5..0000000
--- a/modules.d/45ifcfg/write-ifcfg.sh
+++ /dev/null
@@ -1,264 +0,0 @@
-#!/bin/sh
-
-# NFS root might have reached here before /tmp/net.ifaces was written
-type is_persistent_ethernet_name > /dev/null 2>&1 || . /lib/net-lib.sh
-
-udevadm settle --timeout=30
-
-# shellcheck disable=SC2174
-mkdir -m 0755 -p /tmp/ifcfg/
-# shellcheck disable=SC2174
-mkdir -m 0755 -p /tmp/ifcfg-leases/
-
-print_s390() {
-    local _netif
-    local SUBCHANNELS
-    local i
-
-    _netif="$1"
-    # if we find ccw channel, then use those, instead of
-    # of the MAC
-    # [iface_get_subchannels() from /lib/net-lib.sh sourced at top of this file]
-    SUBCHANNELS=$(iface_get_subchannels "$_netif")
-    [ -n "$SUBCHANNELS" ] || return 1
-
-    SUBCHANNELS=${SUBCHANNELS%,}
-    echo "SUBCHANNELS=\"${SUBCHANNELS}\""
-
-    return 0
-}
-
-hw_bind() {
-    local _netif="$1"
-    local _macaddr="$2"
-
-    [ -n "$_macaddr" ] \
-        && echo "MACADDR=\"$_macaddr\""
-
-    print_s390 "$_netif" \
-        && return 0
-
-    [ -n "$_macaddr" ] && return 0
-
-    is_persistent_ethernet_name "$_netif" && return 0
-
-    [ -f "/sys/class/net/$_netif/addr_assign_type" ] \
-        && [ "$(cat "/sys/class/net/$_netif/addr_assign_type")" != "0" ] \
-        && return 1
-
-    [ -f "/sys/class/net/$_netif/address" ] \
-        || return 1
-
-    echo "HWADDR=\"$(cat /sys/class/net/"$_netif"/address)\""
-}
-
-interface_bind() {
-    local _netif="$1"
-    local _macaddr="$2"
-
-    if [ ! -e "/sys/class/net/$_netif" ]; then
-        warn "Cannot find network interface '$_netif'!"
-        return 1
-    fi
-
-    # see, if we can bind it to some hw params
-    if hw_bind "$_netif" "$_macaddr"; then
-        # only print out DEVICE, if it's user assigned
-        is_kernel_ethernet_name "$_netif" && return 0
-    fi
-
-    echo "DEVICE=\"$_netif\""
-}
-
-for netup in /tmp/net.*.did-setup; do
-    [ -f "$netup" ] || continue
-
-    netif=${netup%%.did-setup}
-    netif=${netif##*/net.}
-    strglobin "$netif" ":*:*:*:*:" && continue
-    [ -e /tmp/ifcfg/ifcfg-"$netif" ] && continue
-    unset bridge
-    unset bond
-    unset bondslaves
-    unset bondname
-    unset bondoptions
-    unset bridgename
-    unset bridgeslaves
-    unset team
-    unset uuid
-    unset ip
-    unset gw
-    unset mtu
-    unset mask
-    unset macaddr
-    unset slave
-    unset ethname
-    unset vlan
-    unset vlanname
-    unset phydevice
-
-    # shellcheck disable=SC1090
-    [ -e /tmp/bond."${netif}".info ] && . /tmp/bond."${netif}".info
-    # shellcheck disable=SC1090
-    [ -e /tmp/bridge."${netif}".info ] && . /tmp/bridge."${netif}".info
-    # shellcheck disable=SC1090
-    [ -e /tmp/team."${netif}".info ] && . /tmp/team."${netif}".info
-
-    read -r uuid < /proc/sys/kernel/random/uuid
-    if [ "$netif" = "$bridgename" ]; then
-        bridge=yes
-    elif [ "$netif" = "$teammaster" ]; then
-        team=yes
-    elif [ "$netif" = "$bondname" ]; then
-        # $netif can't be bridge and bond at the same time
-        bond=yes
-    fi
-
-    for i in "/tmp/vlan.${netif}."*; do
-        [ ! -e "$i" ] && continue
-        # shellcheck disable=SC1090
-        . "$i"
-        vlan=yes
-        break
-    done
-
-    # skip team interfaces for now, the host config must be in sync
-    [ "$netif" = "$teammaster" ] && continue
-
-    {
-        echo "# Generated by dracut initrd"
-        echo "NAME=\"$netif\""
-        [ -z "$vlan" ] && interface_bind "$netif" "$macaddr"
-        echo "ONBOOT=yes"
-        echo "NETBOOT=yes"
-        echo "UUID=\"$uuid\""
-        strstr "$(ip -6 addr show dev "$netif")" 'inet6' && echo "IPV6INIT=yes"
-        if [ -f /tmp/dhclient."$netif".lease ]; then
-            # shellcheck disable=SC1090
-            [ -f /tmp/dhclient."$netif".dhcpopts ] && . /tmp/dhclient."$netif".dhcpopts
-            if [ -f /tmp/net."$netif".has_ibft_config ]; then
-                echo "BOOTPROTO=ibft"
-            else
-                echo "BOOTPROTO=dhcp"
-            fi
-            cp /tmp/dhclient."$netif".lease /tmp/ifcfg-leases/dhclient-"$uuid"-"$netif".lease
-        else
-            # If we've booted with static ip= lines, the override file is there
-            # shellcheck disable=SC1090
-            [ -e /tmp/net."$netif".override ] && . /tmp/net."$netif".override
-            if strglobin "$ip" '*:*:*'; then
-                echo "IPV6INIT=yes"
-                echo "IPV6_AUTOCONF=no"
-                echo "IPV6ADDR=\"$ip/$mask\""
-            else
-                if [ -f /tmp/net."$netif".has_ibft_config ]; then
-                    echo "BOOTPROTO=ibft"
-                else
-                    echo "BOOTPROTO=none"
-                    echo "IPADDR=\"$ip\""
-                    if strstr "$mask" "."; then
-                        echo "NETMASK=\"$mask\""
-                    else
-                        echo "PREFIX=\"$mask\""
-                    fi
-                fi
-            fi
-            if strglobin "$gw" '*:*:*'; then
-                echo "IPV6_DEFAULTGW=\"$gw\""
-            elif [ -n "$gw" ]; then
-                echo "GATEWAY=\"$gw\""
-            fi
-        fi
-        [ -n "$mtu" ] && echo "MTU=\"$mtu\""
-    } > /tmp/ifcfg/ifcfg-"$netif"
-
-    # bridge needs different things written to ifcfg
-    if [ -z "$bridge" ] && [ -z "$bond" ] && [ -z "$vlan" ] && [ -z "$team" ]; then
-        # standard interface
-        echo "TYPE=Ethernet" >> /tmp/ifcfg/ifcfg-"$netif"
-    fi
-
-    if [ -n "$vlan" ]; then
-        {
-            echo "TYPE=Vlan"
-            echo "DEVICE=\"$netif\""
-            echo "VLAN=yes"
-            echo "PHYSDEV=\"$phydevice\""
-        } >> /tmp/ifcfg/ifcfg-"$netif"
-    fi
-
-    if [ -n "$bond" ]; then
-        # bond interface
-        {
-            # This variable is an indicator of a bond interface for initscripts
-            echo "BONDING_OPTS=\"$bondoptions\""
-            echo "NAME=\"$netif\""
-            echo "TYPE=Bond"
-        } >> /tmp/ifcfg/ifcfg-"$netif"
-
-        for slave in $bondslaves; do
-            # write separate ifcfg file for the raw eth interface
-            (
-                echo "# Generated by dracut initrd"
-                echo "NAME=\"$slave\""
-                echo "TYPE=Ethernet"
-                echo "ONBOOT=yes"
-                echo "NETBOOT=yes"
-                echo "SLAVE=yes"
-                echo "MASTER=\"$netif\""
-                echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\""
-                unset macaddr
-                # shellcheck disable=SC1090
-                [ -e /tmp/net."$slave".override ] && . /tmp/net."$slave".override
-                interface_bind "$slave" "$macaddr"
-            ) >> /tmp/ifcfg/ifcfg-"$slave"
-        done
-    fi
-
-    if [ -n "$bridge" ]; then
-        # bridge
-        {
-            echo "TYPE=Bridge"
-            echo "NAME=\"$netif\""
-        } >> /tmp/ifcfg/ifcfg-"$netif"
-        for slave in $bridgeslaves; do
-            # write separate ifcfg file for the raw eth interface
-            (
-                echo "# Generated by dracut initrd"
-                echo "NAME=\"$slave\""
-                echo "TYPE=Ethernet"
-                echo "ONBOOT=yes"
-                echo "NETBOOT=yes"
-                echo "BRIDGE=\"$bridgename\""
-                echo "UUID=\"$(cat /proc/sys/kernel/random/uuid)\""
-                unset macaddr
-                # shellcheck disable=SC1090
-                [ -e /tmp/net."$slave".override ] && . /tmp/net."$slave".override
-                interface_bind "$slave" "$macaddr"
-            ) >> /tmp/ifcfg/ifcfg-"$slave"
-        done
-    fi
-    i=1
-    for ns in $(getargs nameserver) $dns1 $dns2; do
-        echo "DNS${i}=\"${ns}\"" >> /tmp/ifcfg/ifcfg-"$netif"
-        i=$((i + 1))
-    done
-
-    [ -f /tmp/net.route6."$netif" ] && cp /tmp/net.route6."$netif" /tmp/ifcfg/route6-"$netif"
-    [ -f /tmp/net.route."$netif" ] && cp /tmp/net.route."$netif" /tmp/ifcfg/route-"$netif"
-done
-
-# Pass network opts
-mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
-mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient
-echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
-echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
-{
-    cp /tmp/net.* /run/initramfs/
-    for i in /tmp/net.*.resolv.conf; do
-        [ -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
-    cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient
-} > /dev/null 2>&1

diff --git a/test/TEST-60-BONDBRIDGEVLAN/test.sh b/test/TEST-60-BONDBRIDGEVLAN/test.sh
index 40ce08a80be0559672e232bdf216145860f87457..0bd36e9a72a4e33f983b66e61a73849c6b1386e3 100755 (executable)
--- a/test/TEST-60-BONDBRIDGEVLAN/test.sh
+++ b/test/TEST-60-BONDBRIDGEVLAN/test.sh
@@ -12,6 +12,7 @@ TEST_DESCRIPTION="root filesystem on NFS with bridging/bonding/vlan with $USE_NE
 # skip the test if ifcfg dracut module can not be installed
 test_check() {
     test -d /etc/sysconfig/network-scripts
+    module_check ifcfg
 }
 
 # Network topology: