From 4240f6bbb33a37a3fcf8317d7f0fcee3cb7cdbbc Mon Sep 17 00:00:00 2001
From: Benjamin Schieder <blindcoder@scavenger.homeip.net>
Date: Tue, 4 Apr 2006 14:12:14 +0000
Subject: [PATCH] Benjamin Schieder: 	cleanups for mkinitrd

[2006032315545510217] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7418 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/rockinitrd/mkinitrd.sh | 177 ++++++++++++++--------------
 1 file changed, 89 insertions(+), 88 deletions(-)

diff --git a/package/base/rockinitrd/mkinitrd.sh b/package/base/rockinitrd/mkinitrd.sh
index 1d073033b..f9f88297e 100644
--- a/package/base/rockinitrd/mkinitrd.sh
+++ b/package/base/rockinitrd/mkinitrd.sh
@@ -2,7 +2,8 @@
 
 kernel=`uname -r`
 targetdir=`mktemp -d`
-modprobeopt=`echo $kernel | sed '/2.4/ { s,.*,-n,; q; }; s,.*,--show-depends,'`
+modprobeopt="-n"
+[ "${kernel:0:3}" == "2.6" ] && modprobeopt="--show-depends"
 empty=0
 
 rootdir=""
@@ -17,36 +18,36 @@ ramdisk_size=8192
 #	x86 (QEMU)			1024			ext2fs
 #	x86 (QEMU)			4096			cramfs
 
-while [ $# -gt 0 ] ; do
-	case $1 in
+while [ ${#} -gt 0 ] ; do
+	case "${1}" in
 	empty) empty=1 ;;
 	-root) 
-		if [ -d "$2/" ]; then
+		if [ -d "${2}/" ]; then
 			rootdir="${2%/}" ; shift
 		else
 			echo "Can't open ${2}: No such directory."
-			echo "Usage: $0 [ kernel-version ]"
+			echo "Usage: ${0} [ kernel-version ]"
 			exit 1
 		fi
 		;;
-	-cross) cross_compile="$2" ; shift ;;
-	-bs) block_size="$2" ; shift ;;
+	-cross) cross_compile="${2}" ; shift ;;
+	-bs) block_size="${2}" ; shift ;;
 	-fs)
-		case "$2" in
-		ext2fs|ext3fs|cramfs|ramfs) initrdfs="$2" ; shift ;;
+		case "${2}" in
+		ext2fs|ext3fs|cramfs|ramfs) initrdfs="${2}" ; shift ;;
 		*)
-			echo "Filesystem $2 not supported as initrd filesystem."
+			echo "Filesystem ${2} not supported as initrd filesystem."
 			exit 1
 			;;
 		esac
 		;;
 	*)
-		if [ -d "${rootdir}/lib/modules/$1" ]; then
-			kernel="$1"
-			echo kernel $kernel
+		if [ -d "${rootdir}/lib/modules/${1}" ]; then
+			kernel="${1}"
+			echo "kernel ${kernel}"
 		else
-			echo "Can't open ${rootdir}/lib/modules/$1: No such directory."
-			echo "Usage: $0 [ kernel-version ]"
+			echo "Can't open ${rootdir}/lib/modules/${1}: No such directory."
+			echo "Usage: ${0} [ kernel-version ]"
 			exit 1
 		fi
 		;;
@@ -54,7 +55,7 @@ while [ $# -gt 0 ] ; do
 	shift
 done
 
-case $initrdfs in
+case ${initrdfs} in
 	ext2fs|ext3fs|cramfs) 
 		initrd_img="${rootdir}/boot/initrd-${kernel}.img"
 		;;
@@ -63,28 +64,28 @@ case $initrdfs in
 		;;
 esac
 
-echo "Creating $initrd_img ..."
-mkdir -p $targetdir/etc/conf
-if [ "$empty" = 0 ] ; then
+echo "Creating ${initrd_img} ..."
+mkdir -p ${targetdir}/etc/conf
+if [ "${empty}" = 0 ] ; then
 	grep '^modprobe ' ${rootdir}/etc/conf/kernel | grep -v 'no-initrd' | \
 		sed 's,[ 	]#.*,,' | \
-		while read a b ; do $a $modprobeopt -v $b 2> /dev/null; done |
+		while read a b ; do ${a} ${modprobeopt} -v ${b} 2> /dev/null; done |
 		while read a b c; do
-			[[ "$b" = *.ko ]] && b=${b/.ko/};
-			b="`find ${rootdir}/lib/modules/$kernel -wholename "$b.o" -o -wholename "$b.ko"`"
-			echo "Adding $b."
-			mkdir -p $targetdir/${b%/*}
-			cp $b $targetdir/$b
-			echo "/sbin/insmod $b $c" >> $targetdir/etc/conf/kernel
+			[[ "${b}" = *.ko ]] && b=${b/.ko/};
+			b="`find ${rootdir}/lib/modules/${kernel} -wholename "${b}.o" -o -wholename "${b}.ko"`"
+			echo "Adding ${b}."
+			mkdir -p ${targetdir}/${b%/*}
+			cp ${b} ${targetdir}/${b}
+			echo "/sbin/insmod ${b} ${c}" >> ${targetdir}/etc/conf/kernel
 		done
 fi
 
-mkdir -p $targetdir/{dev,root,tmp,proc,sys}
-mknod $targetdir/dev/ram0	b 1 0
-mknod $targetdir/dev/null	c 1 3
-mknod $targetdir/dev/zero	c 1 5
-mknod $targetdir/dev/tty	c 5 0
-mknod $targetdir/dev/console	c 5 1
+mkdir -p ${targetdir}/{dev,root,tmp,proc,sys}
+mknod ${targetdir}/dev/ram0	b 1 0
+mknod ${targetdir}/dev/null	c 1 3
+mknod ${targetdir}/dev/zero	c 1 5
+mknod ${targetdir}/dev/tty	c 5 0
+mknod ${targetdir}/dev/console	c 5 1
 
 # this copies a set of programs and the necessary libraries into a
 # chroot environment
@@ -99,58 +100,58 @@ echo "done"
 libdirs="${rootdir}/lib `sed -e"s,^\(.*\),${rootdir}\1," ${rootdir}/etc/ld.so.conf | tr '\n' ' '`"
 
 needed_libs() {
-	local x="$1" library
+	local x="${1}" library
 
-	${cross_compile}readelf -d $x 2>/dev/null | grep "(NEEDED)" |
+	${cross_compile}readelf -d ${x} 2>/dev/null | grep "(NEEDED)" |
 		sed -e"s,.*Shared library: \[\(.*\)\],\1," |
 		while read library ; do
-			find $libdirs -name "$library" 2>/dev/null |
-			sed -e "s,^$rootdir,,g" | tr '\n' ' '
+			find ${libdirs} -name "${library}" 2>/dev/null |
+			sed -e "s,^${rootdir},,g" | tr '\n' ' '
 		done
 }
 
 echo -n "Copying other files ... "
 for x in ${rootdir}/etc/conf/initrd/initrd_* ; do
-	[ -f $x ] || continue
+	[ -f ${x} ] || continue
 	while read file target ; do
-		file="${rootdir}/$file"
-		[ -e $file ] || continue
+		file="${rootdir}/${file}"
+		[ -e ${file} ] || continue
 
-		for f in `find $file` ; do
-			tfile=${targetdir}/${target}${f#$file}
-			[ -e $tfile ] && continue
+		while read f ; do
+			tfile=${targetdir}/${target}${f#${file}}
+			[ -e ${tfile} ] && continue
 
-			if [ -d $f -a ! -L $f ] ; then
+			if [ -d ${f} -a ! -L ${f} ] ; then
 				mkdir -p ${tfile}
 				continue
 			else
 				mkdir -p ${tfile%/*}
 			fi
 
-# 			if [ -b $f -o -c $f -o -p $f -o -L $f ] ; then
-				cp -a $f $tfile
+# 			if [ -b ${f} -o -c ${f} -o -p ${f} -o -L ${f} ] ; then
+				cp -a ${f} ${tfile}
 # 			else
-# 				cp $f $tfile
+# 				cp ${f} ${tfile}
 # 			fi
 
-			file -L $f | grep -q ELF || continue
-			libs="$libs `needed_libs $f`"
-		done
-	done < $x
+			file -L ${f} | grep -q ELF || continue
+			libs="${libs} `needed_libs ${f}`"
+		done < <( find "${file}" )
+	done < ${x}
 done
 echo "done"
 
 echo -n "Copying required libraries ... "
-while [ -n "$libs" ] ; do
-	oldlibs=$libs
+while [ -n "${libs}" ] ; do
+	oldlibs=${libs}
 	libs=""
-	for x in $oldlibs ; do
-		[ -e $targetdir/$x ] && continue
-		mkdir -p $targetdir/${x%/*}
-		cp $rootdir/$x $targetdir/$x
-		file -L $rootdir/$x | grep -q ELF || continue
-		for y in `needed_libs $rootdir/$x` ; do
-			[ ! -e "$targetdir/$y" ] && libs="$libs $y"
+	for x in ${oldlibs} ; do
+		[ -e ${targetdir}/${x} ] && continue
+		mkdir -p ${targetdir}/${x%/*}
+		cp ${rootdir}/${x} ${targetdir}/${x}
+		file -L ${rootdir}/${x} | grep -q ELF || continue
+		for y in `needed_libs ${rootdir}/${x}` ; do
+			[ ! -e "${targetdir}/${y}" ] && libs="${libs} ${y}"
 		done
 	done
 done
@@ -160,37 +161,37 @@ echo "Creating links for identical files ..."
 while read ck fn
 do
 	# don't link empty files...
-	if [ "$oldck" = "$ck" -a -s "$fn" ] ; then
-		echo "\`- Found ${fn#$targetdir} -> ${oldfn#$targetdir}."
-		rm $fn ; ln -s /${oldfn#$targetdir} $fn
+	if [ "${oldck}" = "${ck}" -a -s "${fn}" ] ; then
+		echo "\`- Found ${fn#${targetdir}} -> ${oldfn#${targetdir}}."
+		rm ${fn} ; ln -s /${oldfn#${targetdir}} ${fn}
 	else
-		oldck=$ck ; oldfn=$fn
+		oldck=${ck} ; oldfn=${fn}
 	fi
-done < <( find $targetdir -type f | xargs md5sum | sort )
+done < <( find ${targetdir} -type f | xargs md5sum | sort )
 
 # though this is not clean, it helps avoid a warning from fsck about
 # it being unable to determine wether a filesystem is mounted.
-ln -s /proc/mounts $targetdir/etc/mtab
+ln -s /proc/mounts ${targetdir}/etc/mtab
 
-echo "Creating initrd filesystem image ($initrdfs): "
-case "$initrdfs" in
+echo "Creating initrd filesystem image (${initrdfs}): "
+case "${initrdfs}" in
 cramfs)
-	[ "$block_size" == "" ] && block_size=4096
-	mkfs.cramfs -b $block_size $targetdir $initrd_img
+	[ "${block_size}" == "" ] && block_size=4096
+	mkfs.cramfs -b ${block_size} ${targetdir} ${initrd_img}
 	;;
 ramfs)
-#	cp -a $targetdir/{linuxrc,init}
-	( cd $targetdir ; find | cpio -o -c > $initrd_img ; )
+#	cp -a ${targetdir}/{linuxrc,init}
+	( cd ${targetdir} ; find | cpio -o -c > ${initrd_img} ; )
 	;;	
 ext2fs|ext3fs)
-	[ "$block_size" == "" ] && block_size=1024
-	block_count=$(( ( 1024 * $ramdisk_size ) / $block_size ))
+	[ "${block_size}" == "" ] && block_size=1024
+	block_count=$(( ( 1024 * ${ramdisk_size} ) / ${block_size} ))
 
 	echo "Creating temporary files."
-	tmpdir=`mktemp -d` ; mkdir -p $tmpdir
-	dd if=/dev/zero of=$initrd_img bs=${block_size} count=$block_count &> /dev/null
+	tmpdir=`mktemp -d` ; mkdir -p ${tmpdir}
+	dd if=/dev/zero of=${initrd_img} bs=${block_size} count=${block_count} &> /dev/null
 	tmpdev="`losetup -f 2>/dev/null`"
-	if [ -z "$tmpdev" ] ; then
+	if [ -z "${tmpdev}" ] ; then
 		for x in /dev/loop* /dev/loop/* ; do
 			[ -b "${x}" ] || continue
 			losetup ${x} 2>&1 >/dev/null || tmpdev="${x}"
@@ -198,27 +199,27 @@ ext2fs|ext3fs)
 		done
 		if [ -z "${tmpdev}" ] ; then
 			echo "No free loopback device found!"
-			rm -f $tmpfile ; rmdir $tmpdir; exit 1
+			rm -f ${tmpfile} ; rmdir ${tmpdir}; exit 1
 		fi
 	fi
-	echo "Using loopback device $tmpdev."
-	losetup "$tmpdev" $initrd_img
+	echo "Using loopback device ${tmpdev}."
+	losetup "${tmpdev}" ${initrd_img}
 
 	echo "Writing initrd image file."
-	mkfs.${initrdfs:0:4} -b $block_size -m 0 -N 360 -q $tmpdev &> /dev/null
-	mount -t ${initrdfs:0:4} $tmpdev $tmpdir
-	rmdir $tmpdir/lost+found/
-	cp -a $targetdir/* $tmpdir
-	umount $tmpdir
+	mkfs.${initrdfs:0:4} -b ${block_size} -m 0 -N 360 -q ${tmpdev} &> /dev/null
+	mount -t ${initrdfs:0:4} ${tmpdev} ${tmpdir}
+	rmdir ${tmpdir}/lost+found/
+	cp -a ${targetdir}/* ${tmpdir}
+	umount ${tmpdir}
  
 	echo "Removing temporary files."
-	losetup -d $tmpdev
-	rm -rf $tmpdir
+	losetup -d ${tmpdev}
+	rm -rf ${tmpdir}
 	;;
 esac
 
 echo "Compressing initrd image file."
-gzip -9 -c $initrd_img > $initrd_img.gz
+gzip -9 -c ${initrd_img} > ${initrd_img}.gz
 
-rm -rf $targetdir
+rm -rf ${targetdir}
 echo "Done."