Attachment #2129 for bug #11790

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




	fi

	local m
	for m in $MODULES $NOLOAD_MODULES; do
		Install "$m" "$MNTDIR/$m" ||
			Fatal "Failed to install $m module."
		m="$MNTDIR/$m"

--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|@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.

			;;
		--after|--with)
			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


FindLoopModules

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" -a -z "$NOLOAD_MODULES" ]; then
	Verbose "No modules are needed - not building initrd image."
	exit 0
fi

Verbose "Using modules: $MODULES $NOLOAD_MODULES"

PrepareBootSplashData





.RB [ \-\-preload
.IR modulename ]
.RB [ \-\-with
.IR modulename|@listfile ]
.RB [ \-\-add
.IR initramfs_filename = filename ]
.RB [ \-\-omit\-scsi\-modules ]

.
.TP
.BI \-\-with= module
Add the modules
.I module
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

Return to bug 11790

Lines 1261-1267 Link Here

(-)mkinitrd-3.0.4.orig/mkinitrd (-8 / +27 lines)
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="$POSTLOAD_MODNAMES $m"
		1527	done
		1528	else
		1529	echo "warning: file $LISTFILE not exist!" >&2
		1530	fi
		1531	else
		1532	POSTLOAD_MODNAMES="$POSTLOAD_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
1677	FindModules $POSTLOAD_MODNAMES	1688	if [ "$IMAGE_TYPE" = initramfs ]; then
		1689	SAVE_MODULES=$MODULES
		1690	MODULES=
		1691	FindModules $POSTLOAD_MODNAMES
		1692	NOLOAD_MODULES=$MODULES
		1693	MODULES=$SAVE_MODULES
		1694	else
		1695	FindModules $POSTLOAD_MODNAMES
		1696	fi
1678		1697
1679	### End module lookup.	1698	### End module lookup.
1680		1699
1681	if [ -n "$ifneeded" -a -z "$MODULES" ]; then	1700	if [ -n "$ifneeded" -a -z "$MODULES" -a -z "$NOLOAD_MODULES" ]; then
1682	Verbose "No modules are needed - not building initrd image."	1701	Verbose "No modules are needed - not building initrd image."
1683	exit 0	1702	exit 0
1684	fi	1703	fi
1685		1704
1686	Verbose "Using modules: $MODULES"	1705	Verbose "Using modules: $MODULES $NOLOAD_MODULES"
1687		1706
1688	PrepareBootSplashData	1707	PrepareBootSplashData
1689		1708

Lines 18-24 Link Here

(-)mkinitrd-3.0.4.orig/mkinitrd.8 (-6 / +11 lines)
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 be load with
108	specified in	108	.IR udevd
109	.IR /etc/modules.conf .	109	(for
		110	.BR initramfs
		111	image type) or
		112	gets loaded after any SCSI modules which are specified in
		113	.IR /etc/modules.conf
		114	(for other image types).
110	This option may be used as many times as necessary.	115	This option may be used as many times as necessary.
111	.	116	.
112	.TP	117	.TP