From ae43adb70dfca7f5bdf75c607ab35d10b68a7eea Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Tue, 24 Mar 2015 15:56:50 +0100
Subject: [PATCH] network: split out kernel-network-modules

---
 modules.d/40network/module-setup.sh                | 52 +---------------------
 .../module-setup.sh                                | 35 +--------------
 2 files changed, 3 insertions(+), 84 deletions(-)
 copy modules.d/{40network => 90kernel-network-modules}/module-setup.sh (59%)

diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index f7e0a877..4bf93cc6 100755
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -11,61 +11,13 @@ check() {
 
 # called by dracut
 depends() {
+    echo "kernel-network-modules"
     return 0
 }
 
 # called by dracut
 installkernel() {
-    # Include wired net drivers, excluding wireless
-    local _arch=$(uname -m)
-
-    net_module_filter() {
-        local _net_drivers='eth_type_trans|register_virtio_device|usbnet_open'
-        local _unwanted_drivers='/(wireless|isdn|uwb|net/ethernet|net/phy|net/team)/'
-        local _ret
-        # subfunctions inherit following FDs
-        local _merge=8 _side2=9
-        function nmf1() {
-            local _fname _fcont
-            while read _fname; do
-                [[ $_fname =~ $_unwanted_drivers ]] && continue
-                case "$_fname" in
-                    *.ko)    _fcont="$(<        $_fname)" ;;
-                    *.ko.gz) _fcont="$(gzip -dc $_fname)" ;;
-                    *.ko.xz) _fcont="$(xz -dc   $_fname)" ;;
-                esac
-                [[   $_fcont =~ $_net_drivers
-                && ! $_fcont =~ iw_handler_get_spy ]] \
-                && echo "$_fname"
-            done
-            return 0
-        }
-        function rotor() {
-            local _f1 _f2
-            while read _f1; do
-                echo "$_f1"
-                if read _f2; then
-                    echo "$_f2" 1>&${_side2}
-                fi
-            done | nmf1 1>&${_merge}
-            return 0
-        }
-        # Use two parallel streams to filter alternating modules.
-        set +x
-        eval "( ( rotor ) ${_side2}>&1 | nmf1 ) ${_merge}>&1"
-        [[ $debug ]] && set -x
-        return 0
-    }
-
-    { find_kernel_modules_by_path drivers/net; if [ "$_arch" = "s390" -o "$_arch" = "s390x" ]; then find_kernel_modules_by_path drivers/s390/net; fi; } \
-        | net_module_filter | instmods
-
-    #instmods() will take care of hostonly
-    instmods \
-        =drivers/net/phy \
-        =drivers/net/team \
-        =drivers/net/ethernet \
-        ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net
+    return 0
 }
 
 # called by dracut
diff --git a/modules.d/40network/module-setup.sh b/modules.d/90kernel-network-modules/module-setup.sh
similarity index 59%
copy from modules.d/40network/module-setup.sh
copy to modules.d/90kernel-network-modules/module-setup.sh
index f7e0a877..b956ebe4 100755
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/90kernel-network-modules/module-setup.sh
@@ -2,10 +2,6 @@
 
 # called by dracut
 check() {
-    local _program
-
-    require_binaries ip arping dhclient || return 1
-
     return 255
 }
 
@@ -70,35 +66,6 @@ installkernel() {
 
 # called by dracut
 install() {
-    local _arch _i _dir
-    inst_multiple ip arping dhclient sed
-    inst_multiple -o ping ping6
-    inst_multiple -o brctl
-    inst_multiple -o teamd teamdctl teamnl
-    inst_simple /etc/libnl/classid
-    inst_script "$moddir/ifup.sh" "/sbin/ifup"
-    inst_script "$moddir/netroot.sh" "/sbin/netroot"
-    inst_script "$moddir/dhclient-script.sh" "/sbin/dhclient-script"
-    inst_simple "$moddir/net-lib.sh" "/lib/net-lib.sh"
-    inst_simple -H "/etc/dhclient.conf"
-    cat "$moddir/dhclient.conf" >> "${initdir}/etc/dhclient.conf"
-    inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
-    inst_hook pre-udev 60 "$moddir/net-genrules.sh"
-    inst_hook cmdline 91 "$moddir/dhcp-root.sh"
-    inst_hook cmdline 92 "$moddir/parse-ibft.sh"
-    inst_hook cmdline 95 "$moddir/parse-vlan.sh"
-    inst_hook cmdline 96 "$moddir/parse-bond.sh"
-    inst_hook cmdline 96 "$moddir/parse-team.sh"
-    inst_hook cmdline 97 "$moddir/parse-bridge.sh"
-    inst_hook cmdline 98 "$moddir/parse-ip-opts.sh"
-    inst_hook cmdline 99 "$moddir/parse-ifname.sh"
-    inst_hook cleanup 10 "$moddir/kill-dhclient.sh"
-
-    _arch=$(uname -m)
-
-    inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
-        {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*"
-
-    dracut_need_initqueue
+    return 0
 }
 
-- 
2.11.4.GIT