Skip to content

Commit 9dbbebb

Browse files
LaszloGombosaafeijoo-suse
authored andcommitted
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/
1 parent 0aa08f0 commit 9dbbebb

File tree

8 files changed

+3
-98
lines changed

8 files changed

+3
-98
lines changed

Diff for: .github/workflows/integration.yml

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
"network-manager",
6666
"network-legacy",
6767
#"systemd-networkd",
68-
#"network-wicked",
6968
#"connman",
7069
]
7170
test: [

Diff for: man/dracut.cmdline.7.asc

+1-1
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ NetworkManager, see *nm-initrd-generator*(8).
594594
opposed to one after another. After the first DHCP response is received,
595595
stop DHCP on all other interfaces. This gives the fastest boot time by
596596
using the IP on interface for which DHCP succeeded first during early boot.
597-
Caveat: Does not apply to Network Manager and to SUSE using wicked.
597+
Caveat: Does not apply to Network Manager.
598598
599599
auto6::: IPv6 autoconfiguration
600600

Diff for: modules.d/35network-legacy/ifup.sh

-4
Original file line numberDiff line numberDiff line change
@@ -519,10 +519,6 @@ for p in $(getargs ip=); do
519519
fi
520520
fi
521521

522-
if command -v wicked > /dev/null && [ -z "$manualup" ]; then
523-
/sbin/netroot "$netif"
524-
fi
525-
526522
exit $ret
527523
fi
528524
done

Diff for: modules.d/35network-wicked/module-setup.sh

-76
This file was deleted.

Diff for: modules.d/35network-wicked/wicked-config.sh

-5
This file was deleted.

Diff for: modules.d/35network-wicked/wicked-run.sh

-6
This file was deleted.

Diff for: modules.d/40network/module-setup.sh

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ check() {
99
depends() {
1010
is_qemu_virtualized && echo -n "qemu-net "
1111

12-
for module in network-wicked connman network-manager network-legacy systemd-networkd; do
12+
for module in connman network-manager network-legacy systemd-networkd; do
1313
if dracut_module_included "$module"; then
1414
network_handler="$module"
1515
break
1616
fi
1717
done
1818

1919
if [ -z "$network_handler" ]; then
20-
if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
21-
network_handler="network-wicked"
22-
elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
20+
if [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
2321
network_handler="connman"
2422
elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
2523
network_handler="network-manager"

Diff for: pkgbuild/dracut.spec

-1
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
446446
%{dracutlibdir}/modules.d/35connman
447447
%{dracutlibdir}/modules.d/35network-manager
448448
%{dracutlibdir}/modules.d/35network-legacy
449-
%{dracutlibdir}/modules.d/35network-wicked
450449
%{dracutlibdir}/modules.d/40network
451450
%{dracutlibdir}/modules.d/45ifcfg
452451
%{dracutlibdir}/modules.d/90kernel-network-modules

0 commit comments

Comments
 (0)