View | Details | Raw Unified | Return to bug 11790
Collapse All | Expand All

(-)mkinitrd-3.0.4.orig/mkinitrd (-7 / +21 lines)
Lines 1261-1267 Link Here
1261
	fi
1261
	fi
1262
1262
1263
	local m
1263
	local m
1264
	for m in $MODULES; do
1264
	for m in $MODULES $NOLOAD_MODULES; do
1265
		Install "$m" "$MNTDIR/$m" ||
1265
		Install "$m" "$MNTDIR/$m" ||
1266
			Fatal "Failed to install $m module."
1266
			Fatal "Failed to install $m module."
1267
		m="$MNTDIR/$m"
1267
		m="$MNTDIR/$m"
Lines 1465-1471 Link Here
1465
--type TYPE                     select image type (initramfs, romfs, ext2).
1465
--type TYPE                     select image type (initramfs, romfs, ext2).
1466
--fstab FILENAME                use FILENAME instead of /etc/fstab.
1466
--fstab FILENAME                use FILENAME instead of /etc/fstab.
1467
--preload MODULENAME            load MODULENAME before all found automatically.
1467
--preload MODULENAME            load MODULENAME before all found automatically.
1468
--with MODULENAME               load MODULENAME after all found automatically.
1468
--with MODULENAME|@listfile     add MODULENAME into initrd image.
1469
--with-raid                     enable software RAID (md) support.
1469
--with-raid                     enable software RAID (md) support.
1470
--omit-scsi-modules             do not load any SCSI modules.
1470
--omit-scsi-modules             do not load any SCSI modules.
1471
--omit-ide-modules              do not load any IDE modules.
1471
--omit-ide-modules              do not load any IDE modules.
Lines 1519-1527 Link Here
1519
			;;
1519
			;;
1520
		--after|--with)
1520
		--after|--with)
1521
			shift
1521
			shift
1522
			POSTLOAD_MODNAMES="$POSTLOAD_MODNAMES $1"
1522
			LISTFILE=`echo "$1" | sed 's/^@//'`
1523
			shift
1523
			if [ "$1" != "$LISTFILE" ]; then
1524
			;;
1524
			    if [ -f "$LISTFILE" ]; then
1525
				for m in `grep -v '^[[:blank:]]*#' "$LISTFILE"` ; do
1526
				    POSTLOAD_MODNAMES="$NOLOAD_MODNAMES $m"
1527
				done
1528
			    else
1529
				echo "warning: file $LISTFILE not exist!" >&2
1530
			    fi
1531
			else
1532
			    POSTLOAD_MODNAMES="$NOLOAD_MODNAMES $1"
1533
			fi
1534
 			shift
1535
 			;;
1525
		--strict)
1536
		--strict)
1526
			strict=1
1537
			strict=1
1527
			shift
1538
			shift
Lines 1674-1689 Link Here
1674
1685
1675
FindLoopModules
1686
FindLoopModules
1676
1687
1688
SAVE_MODULES=$MODULES
1677
FindModules $POSTLOAD_MODNAMES
1689
FindModules $POSTLOAD_MODNAMES
1690
NOLOAD_MODULES=$MODULES
1691
MODULES=$SAVE_MODULES
1678
1692
1679
### End module lookup.
1693
### End module lookup.
1680
1694
1681
if [ -n "$ifneeded" -a -z "$MODULES" ]; then
1695
if [ -n "$ifneeded" -a -z "$MODULES" -a -z "$NOLOAD_MODULES" ]; then
1682
	Verbose "No modules are needed - not building initrd image."
1696
	Verbose "No modules are needed - not building initrd image."
1683
	exit 0
1697
	exit 0
1684
fi
1698
fi
1685
1699
1686
Verbose "Using modules: $MODULES"
1700
Verbose "Using modules: $MODULES $NOLOAD_MODULES"
1687
1701
1688
PrepareBootSplashData
1702
PrepareBootSplashData
1689
1703
(-)mkinitrd-3.0.4.orig/mkinitrd.8 (-5 / +6 lines)
Lines 18-24 Link Here
18
.RB [ \-\-preload
18
.RB [ \-\-preload
19
.IR modulename ]
19
.IR modulename ]
20
.RB [ \-\-with
20
.RB [ \-\-with
21
.IR modulename ]
21
.IR modulename|@listfile ]
22
.RB [ \-\-add
22
.RB [ \-\-add
23
.IR initramfs_filename = filename ]
23
.IR initramfs_filename = filename ]
24
.RB [ \-\-omit\-scsi\-modules ]
24
.RB [ \-\-omit\-scsi\-modules ]
Lines 101-112 Link Here
101
.
101
.
102
.TP
102
.TP
103
.BI \-\-with= module
103
.BI \-\-with= module
104
Load the modules
104
Add the modules
105
.I module
105
.I module
106
in the initial ramdisk image.
106
into the initial ramdisk image.
107
The module gets loaded after any SCSI modules which are
107
The module may gets loaded after any SCSI modules which are
108
specified in
108
specified in
109
.IR /etc/modules.conf .
109
.IR /etc/modules.conf with
110
.IR udevd .
110
This option may be used as many times as necessary.
111
This option may be used as many times as necessary.
111
.
112
.
112
.TP
113
.TP

Return to bug 11790