Skip to content

Commit

Permalink
feat(network-wicked): remove module
Browse files Browse the repository at this point in the history
  • Loading branch information
LaszloGombos authored and aafeijoo-suse committed Dec 28, 2022
1 parent 0aa08f0 commit 9dbbebb
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 98 deletions.
1 change: 0 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:
"network-manager",
"network-legacy",
#"systemd-networkd",
#"network-wicked",
#"connman",
]
test: [
Expand Down
2 changes: 1 addition & 1 deletion man/dracut.cmdline.7.asc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions modules.d/35network-legacy/ifup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
76 changes: 0 additions & 76 deletions modules.d/35network-wicked/module-setup.sh

This file was deleted.

5 changes: 0 additions & 5 deletions modules.d/35network-wicked/wicked-config.sh

This file was deleted.

6 changes: 0 additions & 6 deletions modules.d/35network-wicked/wicked-run.sh

This file was deleted.

6 changes: 2 additions & 4 deletions modules.d/40network/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@ 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
fi
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"
Expand Down
1 change: 0 additions & 1 deletion pkgbuild/dracut.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9dbbebb

Please sign in to comment.