Attachment #1970 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"

--omit-scsi-modules             do not load any SCSI modules.
--omit-ide-modules              do not load any IDE modules.
--omit-raid-modules             do not load any raid modules.
--noload MODULENAME|@listfile   add MODULENAME to initramfs.
--pause                         pause for manual initrd editing.
--nocompress                    do not compress initrd image.
--nobootsplash                  do not add bootsplash to the initrd image.

	[ -n "$1" ] && Exit "$1" || Exit
}

TEMP=`getopt -n "$PROG" -o a:fhvd -l help,version,verbose,debug,force,ifneeded,omit-scsi-modules,omit-ide-modules,omit-raid-modules,with-raid,pause,image-version,nocompress,nobootsplash,strict,fstab:,place:,noload:,before:,preload:,with:,after:,type:,add: -- "$@"` || Usage 1
eval set -- "$TEMP"

img_vers=

			FSTAB_FILE=$1
			shift
			;;
		--place|--noload)
			shift
			LISTFILE=`echo "$1" | sed 's/^@//'`
			if [ "$1" != "$LISTFILE" ]; then
			    if [ -f "$LISTFILE" ]; then
				for m in `grep -v '^[[:blank:]]*#' "$LISTFILE"` ; do
				    NOLOAD_MODNAMES="$NOLOAD_MODNAMES $m"
				done
			    else
				echo "warning: file $LISTFILE not exist!" >&2
			    fi
			else
			    NOLOAD_MODNAMES="$NOLOAD_MODNAMES $1"
			fi
 			shift
 			;;
		--before|--preload)
			shift
			PRELOAD_MODNAMES="$PRELOAD_MODNAMES $1"

	Fatal "Adding extra files supported only for initramfs images."

### Begin module lookup.
FindModules $NOLOAD_MODNAMES
NOLOAD_MODULES=$MODULES
MODULES=

FindModules $PRELOAD_MODNAMES



### 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


Lines 15-20 Link Here

(-)mkinitrd-3.0.3.orig/mkinitrd.8 (+10 lines)
15	.IR type ]	15	.IR type ]
16	.RB [ \-\-fstab	16	.RB [ \-\-fstab
17	.IR filename ]	17	.IR filename ]
		18	.RB [ \-\-noload
		19	.IR modulename ]
18	.RB [ \-\-preload	20	.RB [ \-\-preload
19	.IR modulename ]	21	.IR modulename ]
20	.RB [ \-\-with	22	.RB [ \-\-with
Lines 90-95 Link Here
90	is used.	92	is used.
91	.	93	.
92	.TP	94	.TP
		95	.BI \-\-noload= module
		96	Add the modules
		97	.I module
		98	in the initial ramdisk image.
		99	.IR /etc/modules.conf .
		100	This option may be used as many times as necessary.
		101	.
		102	.TP
93	.BI \-\-preload= module	103	.BI \-\-preload= module
94	Load the module	104	Load the module
95	.I module	105	.I module

Return to bug 11790

Lines 1260-1266 Link Here

(-)mkinitrd-3.0.3.orig/mkinitrd (-4 / +24 lines)
1260	fi	1260	fi
1261		1261
1262	local m	1262	local m
1263	for m in $MODULES; do	1263	for m in $MODULES $NOLOAD_MODULES; do
1264	Install "$m" "$MNTDIR/$m" \|\|	1264	Install "$m" "$MNTDIR/$m" \|\|
1265	Fatal "Failed to install $m module."	1265	Fatal "Failed to install $m module."
1266	m="$MNTDIR/$m"	1266	m="$MNTDIR/$m"
Lines 1469-1474 Link Here
1469	--omit-scsi-modules do not load any SCSI modules.	1469	--omit-scsi-modules do not load any SCSI modules.
1470	--omit-ide-modules do not load any IDE modules.	1470	--omit-ide-modules do not load any IDE modules.
1471	--omit-raid-modules do not load any raid modules.	1471	--omit-raid-modules do not load any raid modules.
		1472	--noload MODULENAME\|@listfile add MODULENAME to initramfs.
1472	--pause pause for manual initrd editing.	1473	--pause pause for manual initrd editing.
1473	--nocompress do not compress initrd image.	1474	--nocompress do not compress initrd image.
1474	--nobootsplash do not add bootsplash to the initrd image.	1475	--nobootsplash do not add bootsplash to the initrd image.
Lines 1488-1494 Link Here
1488	[ -n "$1" ] && Exit "$1" \|\| Exit	1489	[ -n "$1" ] && Exit "$1" \|\| Exit
1489	}	1490	}
1490		1491
1491	TEMP=`getopt -n "$PROG" -o a:fhvd -l help,version,verbose,debug,force,ifneeded,omit-scsi-modules,omit-ide-modules,omit-raid-modules,with-raid,pause,image-version,nocompress,nobootsplash,strict,fstab:,before:,preload:,with:,after:,type:,add: -- "$@"` \|\| Usage 1	1492	TEMP=`getopt -n "$PROG" -o a:fhvd -l help,version,verbose,debug,force,ifneeded,omit-scsi-modules,omit-ide-modules,omit-raid-modules,with-raid,pause,image-version,nocompress,nobootsplash,strict,fstab:,place:,noload:,before:,preload:,with:,after:,type:,add: -- "$@"` \|\| Usage 1
1492	eval set -- "$TEMP"	1493	eval set -- "$TEMP"
1493		1494
1494	img_vers=	1495	img_vers=
Lines 1511-1516 Link Here
1511	FSTAB_FILE=$1	1512	FSTAB_FILE=$1
1512	shift	1513	shift
1513	;;	1514	;;
		1515	--place\|--noload)
		1516	shift
		1517	LISTFILE=`echo "$1" \| sed 's/^@//'`
		1518	if [ "$1" != "$LISTFILE" ]; then
		1519	if [ -f "$LISTFILE" ]; then
		1520	for m in `grep -v '^[[:blank:]]*#' "$LISTFILE"` ; do
		1521	NOLOAD_MODNAMES="$NOLOAD_MODNAMES $m"
		1522	done
		1523	else
		1524	echo "warning: file $LISTFILE not exist!" >&2
		1525	fi
		1526	else
		1527	NOLOAD_MODNAMES="$NOLOAD_MODNAMES $1"
		1528	fi
		1529	shift
		1530	;;
1514	--before\|--preload)	1531	--before\|--preload)
1515	shift	1532	shift
1516	PRELOAD_MODNAMES="$PRELOAD_MODNAMES $1"	1533	PRELOAD_MODNAMES="$PRELOAD_MODNAMES $1"
Lines 1660-1665 Link Here
1660	Fatal "Adding extra files supported only for initramfs images."	1677	Fatal "Adding extra files supported only for initramfs images."
1661		1678
1662	### Begin module lookup.	1679	### Begin module lookup.
		1680	FindModules $NOLOAD_MODNAMES
		1681	NOLOAD_MODULES=$MODULES
		1682	MODULES=
1663		1683
1664	FindModules $PRELOAD_MODNAMES	1684	FindModules $PRELOAD_MODNAMES
1665		1685
Lines 1677-1688 Link Here
1677		1697
1678	### End module lookup.	1698	### End module lookup.
1679		1699
1680	if [ -n "$ifneeded" -a -z "$MODULES" ]; then	1700	if [ -n "$ifneeded" -a -z "$MODULES" -a -z "$NOLOAD_MODULES" ]; then
1681	Verbose "No modules are needed - not building initrd image."	1701	Verbose "No modules are needed - not building initrd image."
1682	exit 0	1702	exit 0
1683	fi	1703	fi
1684		1704
1685	Verbose "Using modules: $MODULES"	1705	Verbose "Using modules: $MODULES $NOLOAD_MODULES"
1686		1706
1687	PrepareBootSplashData	1707	PrepareBootSplashData
1688		1708