From: Laszlo Gombos Date: Thu, 15 Dec 2022 22:39:00 +0000 (+0000) Subject: feat(network-wicked): remove module X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9dbbebb1339d1c3dc8e6b8835a6edbc95c66e2fe;p=thirdparty%2Fdracut.git feat(network-wicked): remove module wicked is being phased out from openSUSE https://news.opensuse.org/2022/01/28/bash-systemd-libvirt-update-in-tw/ --- diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 0a394f736..d1db5f3f0 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -65,7 +65,6 @@ jobs: "network-manager", "network-legacy", #"systemd-networkd", - #"network-wicked", #"connman", ] test: [ diff --git a/man/dracut.cmdline.7.asc b/man/dracut.cmdline.7.asc index 7c62b4946..93861c564 100644 --- a/man/dracut.cmdline.7.asc +++ b/man/dracut.cmdline.7.asc @@ -594,7 +594,7 @@ NetworkManager, see *nm-initrd-generator*(8). opposed to one after another. After the first DHCP response is received, stop DHCP on all other interfaces. This gives the fastest boot time by using the IP on interface for which DHCP succeeded first during early boot. - Caveat: Does not apply to Network Manager and to SUSE using wicked. + Caveat: Does not apply to Network Manager. auto6::: IPv6 autoconfiguration diff --git a/modules.d/35network-legacy/ifup.sh b/modules.d/35network-legacy/ifup.sh index 200444405..68ec3777e 100755 --- a/modules.d/35network-legacy/ifup.sh +++ b/modules.d/35network-legacy/ifup.sh @@ -519,10 +519,6 @@ for p in $(getargs ip=); do fi fi - if command -v wicked > /dev/null && [ -z "$manualup" ]; then - /sbin/netroot "$netif" - fi - exit $ret fi done diff --git a/modules.d/35network-wicked/module-setup.sh b/modules.d/35network-wicked/module-setup.sh deleted file mode 100755 index 990355c99..000000000 --- a/modules.d/35network-wicked/module-setup.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash - -# called by dracut -check() { - require_binaries wicked || return 1 - - # do not add this module by default - return 255 -} - -# called by dracut -depends() { - echo systemd dbus - return 0 -} - -# called by dracut -installkernel() { - return 0 -} - -# called by dracut -install() { - local -a wicked_units - - inst_hook cmdline 99 "$moddir/wicked-config.sh" - - # Seems to not execute if in initqueue/settled - inst_hook pre-udev 99 "$moddir/wicked-run.sh" - - # even with wicked configuring the interface, ip is useful - inst_multiple ip - - inst_dir /etc/wicked/extensions - inst_dir /usr/share/wicked/schema - if [ -d /usr/lib/wicked/bin ]; then - inst_dir /usr/lib/wicked/bin - inst_multiple "/usr/lib/wicked/bin/*" - elif [ -d /usr/libexec/wicked/bin ]; then - inst_dir /usr/libexec/wicked/bin - inst_multiple "/usr/libexec/wicked/bin/*" - fi - inst_dir /var/lib/wicked - - inst_multiple "/etc/wicked/*.xml" - inst_multiple "/etc/wicked/extensions/*" - if [ -f /etc/dbus-1/system.d/org.opensuse.Network.conf ]; then - inst_multiple "/etc/dbus-1/system.d/org.opensuse.Network*" - elif [ -f /usr/share/dbus-1/system.d/org.opensuse.Network.conf ]; then - inst_multiple "/usr/share/dbus-1/system.d/org.opensuse.Network*" - fi - inst_multiple "/usr/share/wicked/schema/*" - inst_multiple "/usr/sbin/wicked*" - - wicked_units=( - "$systemdsystemunitdir"/wickedd.service - "$systemdsystemunitdir"/wickedd-auto4.service - "$systemdsystemunitdir"/wickedd-dhcp4.service - "$systemdsystemunitdir"/wickedd-dhcp6.service - "$systemdsystemunitdir"/wickedd-nanny.service - ) - - inst_multiple "${wicked_units[@]}" - - for unit in "${wicked_units[@]}"; do - sed -i 's/^After=.*/After=dbus.service/g' "$initdir/$unit" - sed -i 's/^Before=\(.*\)/Before=\1 dracut-pre-udev.service/g' "$initdir/$unit" - sed -i 's/^Wants=\(.*\)/Wants=\1 dbus.service/g' "$initdir/$unit" - # shellcheck disable=SC1004 - sed -i -e \ - '/^\[Unit\]/aDefaultDependencies=no\ - Conflicts=shutdown.target\ - Before=shutdown.target' \ - "$initdir/$unit" - done -} diff --git a/modules.d/35network-wicked/wicked-config.sh b/modules.d/35network-wicked/wicked-config.sh deleted file mode 100755 index 850c19f06..000000000 --- a/modules.d/35network-wicked/wicked-config.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -getcmdline > /tmp/cmdline.$$.conf -wicked show-config --ifconfig dracut:cmdline:/tmp/cmdline.$$.conf > /tmp/dracut.xml -rm -f /tmp/cmdline.$$.conf diff --git a/modules.d/35network-wicked/wicked-run.sh b/modules.d/35network-wicked/wicked-run.sh deleted file mode 100755 index eaf427ac9..000000000 --- a/modules.d/35network-wicked/wicked-run.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# ensure wickedd is running -systemctl start wickedd -# detection wrapper around ifup --ifconfig "final xml" all -wicked bootstrap --ifconfig /tmp/dracut.xml all diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh index 1ab13eff7..ba7104d9d 100755 --- a/modules.d/40network/module-setup.sh +++ b/modules.d/40network/module-setup.sh @@ -9,7 +9,7 @@ check() { depends() { is_qemu_virtualized && echo -n "qemu-net " - for module in network-wicked connman network-manager network-legacy systemd-networkd; do + for module in connman network-manager network-legacy systemd-networkd; do if dracut_module_included "$module"; then network_handler="$module" break @@ -17,9 +17,7 @@ depends() { done if [ -z "$network_handler" ]; then - if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then - network_handler="network-wicked" - elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then + if [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then network_handler="connman" elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then network_handler="network-manager" diff --git a/pkgbuild/dracut.spec b/pkgbuild/dracut.spec index 11fa21738..73a91215b 100644 --- a/pkgbuild/dracut.spec +++ b/pkgbuild/dracut.spec @@ -446,7 +446,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/35connman %{dracutlibdir}/modules.d/35network-manager %{dracutlibdir}/modules.d/35network-legacy -%{dracutlibdir}/modules.d/35network-wicked %{dracutlibdir}/modules.d/40network %{dracutlibdir}/modules.d/45ifcfg %{dracutlibdir}/modules.d/90kernel-network-modules