/[magellan-source]/trunk/mkinitrd-magellan/mkinitrd.in

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

Parent Directory | Revision Log | View Patch Patch

-revision 1188 by niro,
Thu Dec 16 01:24:51 2010 UTC
+revision 1793 by niro,
Mon Apr  2 11:40:49 2012 UTC
 Line 94 
 moduledep()
  	echo "Looking for deps of module $1"
  	deps=$(awk 'BEGIN { searched=ARGV[2]; ARGV[2]=""; rc=1 } \
- 		function modname(filename) { match(filename, /\/([^\/]+)\.k?o:?$/, ret); return ret[1] } \
+ 		function modname(filename) { match(filename, /\/([^\/]+)\.k?o.?g?z?:?$/, ret); return ret[1] } \
  		function show() { if (orig == searched) { print dep; orig=""; rc=0; exit } } \
  		/^.*kernel/ { show(); \
  			orig=modname($1); dep=""; \
 Line 132 
 findmodule()
  	case "${MODULES} " in
  		*"/${modName}.ko "*) return ;;
+ 		*"/${modName}.ko.gz "*) return ;;
  	esac
  	if echo ${builtins} | egrep -q '(^| )'${modName}'( |$)'
-Line 164 
 findmodule()
+Line 165 
 findmodule()
  		done
  	fi
- 	for modExt in o.gz o ko
+ 	for modExt in o.gz o ko ko.gz
  	do
  		for modDir in /lib/modules/${kernel}/updates /lib/modules/${kernel}
  		do
-Line 252 
 findstoragedriver()
+Line 253 
 findstoragedriver()
  		modalias=$(cat modalias)
  		for driver in $(modprobe --set-version ${kernel} --show-depends ${modalias} 2>/dev/null| awk '{ print gensub(".*/","","g",$2) }')
  		do
- 			findmodule ${driver%%.ko}
+ 			findmodule ${driver%%.*}
  		done
  		popd >/dev/null 2>&1
  	done
-Line 753 
 add_initrd '#!/bin/sh'
+Line 754 
 add_initrd '#!/bin/sh'
  add_initrd 'mount -t proc proc /proc'
  add_initrd 'mount -t sysfs sysfs /sys'
- add_initrd 'mount -t tmpfs tmpfs /dev -o rw,mode=0644,size=1024'
+ add_initrd "if [[ -z \$(grep '[[:space:]]/dev[[:space:]]' /proc/mounts | cut -d ' ' -f2) ]]"
+ add_initrd 'then'
+ add_initrd '	# many video drivers needed exec access'
+ add_initrd '	fstype=ramfs'
+ add_initrd '	# tmpfs was suggested by Greg Kroah-Hartman'
+ add_initrd "	[[ \$(grep '[[:space:]]tmpfs' /proc/filesystems | cut -d \$'\\t' -f2) = tmpfs ]] && fstype=tmpfs"
+ add_initrd '	# mount devtmpfs if supported'
+ add_initrd "	[[ \$(grep '[[:space:]]devtmpfs' /proc/filesystems | cut -d \$'\\t' -f2) = devtmpfs ]] && fstype=devtmpfs"
+ add_initrd '	mount -t ${fstype} dev /dev -o exec,nosuid,mode=0755,size=10M'
+ add_initrd 'fi'
  [[ ${IMAGE_TYPE} = loopback ]] && add_initrd 'mount -t ramfs -o remount,rw /dev/ram /'
-Line 773 
 add_initrd 'echo /sbin/mdev > /proc/sys/
+Line 783 
 add_initrd 'echo /sbin/mdev > /proc/sys/
  for MODULE in ${MODULES}
  do
  	text=""
- 	module=$(echo ${MODULE} | sed "s|.*/||" | sed "s/.k\?o$//")
+ 	module=$(echo ${MODULE} | sed "s|.*/||" | sed -e "s/.k\?o.\?g\?z\?$//" -e "s/.gz//")
- 	fullmodule=$(echo ${MODULE} | sed "s|.*/||")
+ 	fullmodule=$(echo ${MODULE} | sed -e "s|.*/||" -e "s/.gz//")
  	options=$(sed -n -e "s/^options[     ][      ]*${module}[      ][      ]*//p" ${modprobeconf} 2>/dev/null)
-Line 808 
 do
+Line 818 
 do
  	fi
  done
+ # respect rootdelay kernel param
+ add_initrd 'for i in $(cat /proc/cmdline); do case ${i} in rootdelay=*) ROOTDELAY="${i#*=}";; esac; done'
+ add_initrd 'if [ ! -z "${ROOTDELAY}" ]; then echo "-- Requested a rootdelay of ${ROOTDELAY} seconds ..."; sleep ${ROOTDELAY};fi'
  # lvm support
  if [ -n "${vg_list}" ]
  then
-Line 849 
 fi
+Line 863 
 fi
  # get the right initexec
  add_initrd "INITEXEC=\"${INITEXEC}\""
  # support init=* from cmdline
- add_initrd 'for i in $(cat /proc/cmdline); do if [[ ${i} = init=* ]]; then INITEXEC=${i/init=}; fi; done'
+ add_initrd 'for i in $(cat /proc/cmdline); do case ${i} in init=*) INITEXEC="${i#*=}";; esac; done'
  add_initrd 'echo "-- Mounting sysroot ..."'
  add_initrd '. /etc/rootdev'
  add_initrd 'echo "${device} /sysroot ${rootfs} defaults,ro 0 0" > /etc/fstab'
  add_initrd 'mount /sysroot || ash'
+ # use devtmpfs if supported
+ add_initrd "if [ \"\$(grep devtmpfs /proc/filesystems | cut -d$'\t' -f2)\" = \"devtmpfs\" ]; then mount -t devtmpfs dev /sysroot/dev;fi"
  # unset hotplug event-manager
  add_initrd 'echo > /proc/sys/kernel/hotplug'
-Line 863 
 add_initrd 'echo > /proc/sys/kernel/hotp
+Line 880 
 add_initrd 'echo > /proc/sys/kernel/hotp
  add_initrd 'echo 3 > /proc/sys/kernel/printk'
  add_initrd 'BREAK_ENABLED=no'
- add_initrd 'for i in $(cat /proc/cmdline); do if [[ ${i} = break ]]; then BREAK_ENABLED=yes; fi; done'
+ add_initrd 'for i in $(cat /proc/cmdline); do case ${i} in break) BREAK_ENABLED=yes;; esac; done'
- add_initrd 'if [[ ${BREAK_ENABLED} = yes ]]; then echo "-- Break requested, type 'exit' to resume operation ..."; ash; fi'
+ add_initrd 'if [ "${BREAK_ENABLED}" = "yes" ]; then echo "-- Break requested, type 'exit' to resume operation ..."; ash; fi'
  add_initrd 'echo "-- Switching to real sysroot ..."'
- add_initrd 'umount /dev'
+ add_initrd 'mount --move /dev /sysroot/dev'
- add_initrd 'umount /sys'
+ add_initrd 'mount --move /sys /sysroot/sys'
- add_initrd 'umount /proc'
+ add_initrd 'mount --move /proc /sysroot/proc'
  [[ ${IMAGE_TYPE} = initramfs ]] && add_initrd 'exec run-init /sysroot ${INITEXEC} $@ </sysroot/dev/console >/sysroot/dev/console'
  if [[ ${IMAGE_TYPE} = loopback ]]
-Line 893 
 do
+Line 910 
 do
  	if [ -x /usr/bin/strip ] && [[ ${NOSTRIP} = false ]]
  	then
  		/usr/bin/strip -g ${verbose} ${MODULE} -o ${DEST}/lib/$(basename ${MODULE}) || die
+ 	# handle gzip compressed modules right
+ 	elif [[ ${MODULE##*.} = gz ]]
+ 	then
+ 		zcat ${verbose} ${MODULE} > ${DEST}/lib/$(basename ${MODULE} .gz) || die
  	else
  		cp ${verbose} -a ${MODULE} ${DEST}/lib || die
  	fi

 Legend:



Removed from v.1188
 


changed lines


 
Added in v.1793
 Legend:



Removed from v.1188
 


changed lines


 
Added in v.1793
-Removed from v.1188
+Added in v.1793