Diff of /trunk/mkinitrd-magellan/mkinitrd.in

Parent Directory | Revision Log | Patch

	revision 992 by niro, Wed Aug 5 19:20:53 2009 UTC	revision 993 by niro, Sun May 30 11:47:04 2010 UTC
#	Line 53  force=""	Line 53  force=""
53	verbose=""	verbose=""
54	img_vers=""	img_vers=""
55	builtins=""	builtins=""
56	modulefile=/etc/modules.conf	modulefile="/etc/modules.conf"
57		modprobeconf="/etc/modprobe.d/*"
58	rc=0	rc=0
59
60	IMAGESIZE=4000	IMAGESIZE=4000
#	Line 472  fi	Line 473  fi
473	####### get modules ##########	####### get modules ##########
474
475	echo "Creating ${IMAGE_TYPE} initrd image"	echo "Creating ${IMAGE_TYPE} initrd image"
	modulefile=/etc/modprobe.conf
476
477	for n in ${PREMODS}	for n in ${PREMODS}
478	do	do
#	Line 768  do	Line 768  do
768	module=$(echo ${MODULE} | sed "s|.*/||" | sed "s/.k\?o$//")	module=$(echo ${MODULE} | sed "s|.*/||" | sed "s/.k\?o$//")
769	fullmodule=$(echo ${MODULE} | sed "s|.*/||")	fullmodule=$(echo ${MODULE} | sed "s|.*/||")
770
771	options=$(sed -n -e "s/^options[     ][      ]*${module}[      ][      ]*//p" ${modulefile} 2>/dev/null)	options=$(sed -n -e "s/^options[     ][      ]*${module}[      ][      ]*//p" ${modprobeconf} 2>/dev/null)
772
773	if [ -n "${options}" ]	if [ -n "${options}" ]
774	then	then

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.992   changed lines   Added in v.993