Attachment 2129 Details for Bug 11790 – mkinitrd-3.0.4-udev_load.patch

[patch] mkinitrd-3.0.4-udev_load.patch

mkinitrd-3.0.4-udev_load.patch (text/plain), 2.96 KB, created by led on 2007-08-02 19:51:23 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: led

Created: 2007-08-02 19:51:23 MSD

Size: 2.96 KB

patch

obsolete

>diff -urN mkinitrd-3.0.4.orig/mkinitrd mkinitrd-3.0.4/mkinitrd
>--- mkinitrd-3.0.4.orig/mkinitrd	2007-06-01 15:39:38 +0300
>+++ mkinitrd-3.0.4/mkinitrd	2007-08-02 18:50:07 +0300
>@@ -1261,7 +1261,7 @@
> 	fi
> 
> 	local m
>-	for m in $MODULES; do
>+	for m in $MODULES $NOLOAD_MODULES; do
> 		Install "$m" "$MNTDIR/$m" ||
> 			Fatal "Failed to install $m module."
> 		m="$MNTDIR/$m"
>@@ -1465,7 +1465,7 @@
> --type TYPE                     select image type (initramfs, romfs, ext2).
> --fstab FILENAME                use FILENAME instead of /etc/fstab.
> --preload MODULENAME            load MODULENAME before all found automatically.
>---with MODULENAME               load MODULENAME after all found automatically.
>+--with MODULENAME|@listfile     add MODULENAME into initrd image.
> --with-raid                     enable software RAID (md) support.
> --omit-scsi-modules             do not load any SCSI modules.
> --omit-ide-modules              do not load any IDE modules.
>@@ -1519,9 +1519,20 @@
> 			;;
> 		--after|--with)
> 			shift
>-			POSTLOAD_MODNAMES="$POSTLOAD_MODNAMES $1"
>-			shift
>-			;;
>+			LISTFILE=`echo "$1" | sed 's/^@//'`
>+			if [ "$1" != "$LISTFILE" ]; then
>+			    if [ -f "$LISTFILE" ]; then
>+				for m in `grep -v '^[[:blank:]]*#' "$LISTFILE"` ; do
>+				    POSTLOAD_MODNAMES="$POSTLOAD_MODNAMES $m"
>+				done
>+			    else
>+				echo "warning: file $LISTFILE not exist!" >&2
>+			    fi
>+			else
>+			    POSTLOAD_MODNAMES="$POSTLOAD_MODNAMES $1"
>+			fi
>+ 			shift
>+ 			;;
> 		--strict)
> 			strict=1
> 			shift
>@@ -1674,16 +1685,24 @@
> 
> FindLoopModules
> 
>-FindModules $POSTLOAD_MODNAMES
>+if [ "$IMAGE_TYPE" = initramfs ]; then
>+    SAVE_MODULES=$MODULES
>+    MODULES=
>+    FindModules $POSTLOAD_MODNAMES
>+    NOLOAD_MODULES=$MODULES
>+    MODULES=$SAVE_MODULES
>+else
>+    FindModules $POSTLOAD_MODNAMES
>+fi
> 
> ### End module lookup.
> 
>-if [ -n "$ifneeded" -a -z "$MODULES" ]; then
>+if [ -n "$ifneeded" -a -z "$MODULES" -a -z "$NOLOAD_MODULES" ]; then
> 	Verbose "No modules are needed - not building initrd image."
> 	exit 0
> fi
> 
>-Verbose "Using modules: $MODULES"
>+Verbose "Using modules: $MODULES $NOLOAD_MODULES"
> 
> PrepareBootSplashData
> 
>diff -urN mkinitrd-3.0.4.orig/mkinitrd.8 mkinitrd-3.0.4/mkinitrd.8
>--- mkinitrd-3.0.4.orig/mkinitrd.8	2007-06-01 15:39:38 +0300
>+++ mkinitrd-3.0.4/mkinitrd.8	2007-08-02 18:49:30 +0300
>@@ -18,7 +18,7 @@
> .RB [ \-\-preload
> .IR modulename ]
> .RB [ \-\-with
>-.IR modulename ]
>+.IR modulename|@listfile ]
> .RB [ \-\-add
> .IR initramfs_filename = filename ]
> .RB [ \-\-omit\-scsi\-modules ]
>@@ -101,12 +101,17 @@
> .
> .TP
> .BI \-\-with= module
>-Load the modules
>+Add the modules
> .I module
>-in the initial ramdisk image.
>-The module gets loaded after any SCSI modules which are
>-specified in
>-.IR /etc/modules.conf .
>+into the initial ramdisk image.
>+The module may be load with 
>+.IR udevd
>+(for
>+.BR initramfs
>+image type) or
>+gets loaded after any SCSI modules which are specified in
>+.IR /etc/modules.conf
>+(for other image types).
> This option may be used as many times as necessary.
> .
> .TP

Actions: View | Diff

Attachments on bug 11790: 1970 | 2126 | 2127 | 2128 | 2129