diff -Nur mkinitrd-3.5.22/mkinitrd mkinitrd-3.5.22-network-modules/mkinitrd --- mkinitrd-3.5.22/mkinitrd 2004-05-07 03:48:36.000000000 +0200 +++ mkinitrd-3.5.22-network-modules/mkinitrd 2004-07-20 21:56:53.000000000 +0200 @@ -20,7 +20,7 @@ # Preston Brown # Bill Nottingham # Guillaume Cottenceau - +# Maik Broemme PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH export PATH @@ -46,8 +46,9 @@ usage () { echo "usage: `basename $0` [--version] [-v] [-f] [--preload ]" >&2 echo " [--omit-scsi-modules] [--omit-raid-modules] [--omit-lvm-modules]" >&2 - echo " [--with=] [--image-version] [--fstab=] [--nocompress]" >&2 - echo " [--builtin=] [--nopivot] " >&2 + echo " [--omit-network-modules] [--with=] [--image-version]" >&2 + echo " [--fstab=] [--nocompress] [--builtin=]" >&2 + echo " [--nopivot] " >&2 echo "" >&2 echo " (ex: `basename $0` /boot/initrd-2.2.5-15.img 2.2.5-15)" >&2 exit 1 @@ -242,6 +243,9 @@ --omit-lvm-modules) nolvm=1 ;; + --omit-network-modules) + nonetwork=1 + ;; --image-version) img_vers=yes ;; @@ -392,6 +396,16 @@ fi fi +# If we have network devices, include the necessary modules +if [ -z "$nonetwork" ]; then + drivers=$(awk '/^alias eth[0-9]* / { print $3}' < /etc/modules.conf) + if [ -n "$drivers" ]; then + for driver in $drivers; do + findmodule $driver + done + fi +fi + # If we have dasd devices, include the necessary modules (S/390) if [ -d /proc/dasd ]; then findmodule -dasd_mod diff -Nur mkinitrd-3.5.22/mkinitrd.8 mkinitrd-3.5.22-network-modules/mkinitrd.8 --- mkinitrd-3.5.22/mkinitrd.8 2003-03-05 00:12:22.000000000 +0100 +++ mkinitrd-3.5.22-network-modules/mkinitrd.8 2004-07-20 18:22:01.000000000 +0200 @@ -6,6 +6,7 @@ \fBmkinitrd\fR [--version] [-v] [-f] [--preload=\fImodule\fR] [--omit-scsi-modules] [--omit-raid-modules] [--omit-lvm-modules] + [--omit-network-modules] [--with=\fImodule\fR] [--image-version] [--fstab=\fIfstab\fR] [--nocompress] [--builtin=\fImodule\fR] [--nopivot] @@ -91,6 +92,11 @@ modules, even if they are present. .TP +\fB-\-omit-network-modules +Do not load any network modules, including 'mii' module, even if they are +present. + +.TP \fB-\-preload=\fR\fImodule\fR Load the module \fImodule\fR in the initial ramdisk image. The module gets loaded before any SCSI modules which are specified in \fI/etc/modules.conf\fR.