File base-patches.diff of Package mkinitrd

Overview Repositories Revisions Requests Users Attributes Meta

File base-patches.diff of Package mkinitrd (Revision 9b5606ec10b07243161b45d68be9520b)

Currently displaying revision 9b5606ec10b07243161b45d68be9520b , Show latest

Index: b/sbin/mkinitrd
===================================================================
--- a/sbin/mkinitrd
+++ b/sbin/mkinitrd
@@ -56,6 +56,7 @@ usage() {
           -d root_device   Root device. Defaults to the device from which
                            / is mounted. Overrides the rootdev enviroment
 			   variable if set.
+	  -c "kernel command line"  Extra kernel command line settings.
 	  -s size          Add splash animation and bootscreen to initrd.
 	  -t tmp_dir       Temporary directory. Defaults to /var/tmp.
           -l lib_dir       mkinitrd directory. Defaults to /lib/mkinitrd.
@@ -97,23 +98,23 @@ default_kernel_images() {
 
     kernel_images=""
     initrd_images=""
-    for kernel_image in $(ls /boot \
+    for kernel_image in $(ls $root_dir/boot \
 	    | sed -ne "\|^$regex$-[0-9.]\+-[0-9]\+-[a-z0-9]\+$$\?|p") ; do
 
 	# Note that we cannot check the RPM database here -- this
 	# script is itself called from within the binary kernel
 	# packages, and rpm does not allow recursive calls.
 
-	[ -L "/boot/$kernel_image" ] && continue
+	[ -L "$root_dir/boot/$kernel_image" ] && continue
 	[ "${kernel_image%%.gz}" != "$kernel_image" ] && continue
 	kernel_version=$(/sbin/get_kernel_version \
-			 /boot/$kernel_image 2> /dev/null)
+			 $root_dir/boot/$kernel_image 2> /dev/null)
 	initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|")
 	if [ "$kernel_image" != "$initrd_image" -a \
 	     -n "$kernel_version" -a \
-	     -d "/lib/modules/$kernel_version" ]; then
-		kernel_images="$kernel_images /boot/$kernel_image"
-		initrd_images="$initrd_images /boot/$initrd_image"
+	     -d "$root_dir/lib/modules/$kernel_version" ]; then
+		kernel_images="$kernel_images $root_dir/boot/$kernel_image"
+		initrd_images="$initrd_images $root_dir/boot/$initrd_image"
 	fi
     done
 }
@@ -142,6 +143,7 @@ build_day=@BUILD_DAY@
 scan_pci_bus=
 create_monster_initrd=
 verbose=
+kernel_command_line=
 INITRD_PATH=/lib/mkinitrd
 
 # read the sysconfig configs
@@ -149,7 +151,7 @@ if [ -e "/etc/sysconfig/initrd" ]; then
     . /etc/sysconfig/initrd
 fi
 
-while getopts :ef:hk:i:l:m:u:b:d:s:St:D:I:V:a:M:Pj:Au:vp: a ; do
+while getopts :ef:hk:i:l:m:c:u:b:d:s:St:D:I:V:a:M:Pj:Au:vp: a ; do
     case $a in
 	\:|\?)	case $OPTARG in
 		k)  echo "-k requires kernel list parameter"
@@ -158,6 +160,8 @@ while getopts :ef:hk:i:l:m:u:b:d:s:St:D:
 		    ;;
 		m)  echo "-m requires module list parameter"
 		    ;;
+		c)  echo "-c requires kernel command line parameter"
+		    ;;
 		u)  echo "-u requires module list parameter"
 		    ;;
 		f)  echo "-f requires feature list parameter"
@@ -203,6 +207,9 @@ while getopts :ef:hk:i:l:m:u:b:d:s:St:D:
 	m)  modules=$OPTARG
 	    modules_set=1
 	    ;;
+	c)  kernel_command_line=$OPTARG
+	    echo Using kernel command line parameters $kernel_command_line
+	    ;;
 	u)  domu_modules=$OPTARG
 	    domu_modules_set=1
 	    ;;
@@ -443,11 +450,11 @@ for ((i=0 ; $i<${#kernel_images[@]} ; i+
 #    modules="$boot_modules"
     kernel_image=${kernel_images[$i]}
     [ ${kernel_image:0:1} != '/' ] \
-    	&& kernel_image=$boot_dir/$kernel_image
+    	&& kernel_image=$root_dir$boot_dir/$kernel_image
 
     initrd_image=${initrd_images[$i]}
     [ ${initrd_image:0:1} != '/' ] \
-    	&& initrd_image=$boot_dir/$initrd_image
+    	&& initrd_image=$root_dir$boot_dir/$initrd_image
 
     mkinitrd_kernel $kernel_image $initrd_image
     [ $? -eq 0 ] || exit 1
Index: b/scripts/setup-block.sh
===================================================================
--- a/scripts/setup-block.sh
+++ b/scripts/setup-block.sh
@@ -65,6 +65,10 @@ get_devmodule() {
 	    ida*)
 		echo cpqarray
 		;;
+	    loop*)
+		# we are appearantly called from inside a loop mounted
+		# image, just assume the real device was already dealt with
+		;;
 	    *)
 		if [ ! -d /sys/block/$blkdev/device ] ; then
 		    echo "Device $blkdev not handled" >&2
Index: b/scripts/setup-dmraid.sh
===================================================================
--- a/scripts/setup-dmraid.sh
+++ b/scripts/setup-dmraid.sh
@@ -8,7 +8,7 @@ if [ -x /sbin/dmraid -a -x /sbin/dmsetup
 	newbd=
 	for bd in $blockdev ; do
 	    update_blockdev $bd
-	    if [ $blockdriver = device-mapper ]; then
+	    if [ "$blockdriver" = "device-mapper" ]; then
 		dm_uuid=$(dmsetup info -c --noheadings -o uuid -j $blockmajor -m $blockminor)
 		dm_creator=${dm_uuid%-*}
 		if [ "$dm_creator" = "dmraid" ]; then
Index: b/scripts/setup-modules.sh
===================================================================
--- a/scripts/setup-modules.sh
+++ b/scripts/setup-modules.sh
@@ -39,10 +39,10 @@ resolve_modules() {
 	local with_modprobe_conf
 	module=${module%.o}  # strip trailing ".o" just in case.
 	module=${module%.ko}  # strip trailing ".ko" just in case.
-	if [ -e /etc/modprobe.conf ]; then
+	if [ -e $root_dir/etc/modprobe.conf ]; then
 	    with_modprobe_conf="-C /etc/modprobe.conf"
 	fi
-	module_list=$(/sbin/modprobe $with_modprobe_conf \
+	module_list=$(chroot ${root_dir:-/} /sbin/modprobe $with_modprobe_conf \
 	    --set-version $kernel_version --ignore-install \
 	    --show-depends $module 2> /dev/null \
 	    | sed -ne 's:.*insmod /\?::p' | sed -ne 's:\ .*\?::p' )
Index: b/scripts/setup-multipath.sh
===================================================================
--- a/scripts/setup-multipath.sh
+++ b/scripts/setup-multipath.sh
@@ -12,7 +12,7 @@ fi
 if [ -x /sbin/multipath -a -x /sbin/dmsetup ] ; then
     for bd in $blockdev ; do
 	update_blockdev $bd
-	if [ $blockdriver = device-mapper ]; then
+	if [ "$blockdriver" = "device-mapper" ]; then
 	    dm_uuid=$(dmsetup info -c --noheadings -o uuid -j $blockmajor -m $blockminor)
 	    dm_creator=${dm_uuid%-*}
 	    if [ "$dm_creator" = "mpath" ]; then
Index: b/scripts/setup-network.sh
===================================================================
--- a/scripts/setup-network.sh
+++ b/scripts/setup-network.sh
@@ -170,7 +170,7 @@ fi
 mkdir -p $tmp_mnt/var/lib/dhcpcd
 mkdir -p $tmp_mnt/var/run
 
-cp_bin $root_dir/lib/mkinitrd/bin/ipconfig.sh $tmp_mnt/bin/ipconfig
+cp_bin /lib/mkinitrd/bin/ipconfig.sh $tmp_mnt/bin/ipconfig
 
 [ "$use_ipconfig" ] && nettype=static
 [ "$use_dhcp" ] && nettype=dhcp
Index: b/scripts/setup-prepare.sh
===================================================================
--- a/scripts/setup-prepare.sh
+++ b/scripts/setup-prepare.sh
@@ -102,8 +102,8 @@ use_script() {
     echo -e "Kernel image:   $kernel_image"
     echo -e "Initrd image:   $initrd_image"
 
-    if [ ! -d "/lib/modules/$kernel_version/misc" -a \
-	 ! -d "/lib/modules/$kernel_version/kernel" ]; then
+    if [ ! -d "$root_dir/lib/modules/$kernel_version/misc" -a \
+	 ! -d "$root_dir/lib/modules/$kernel_version/kernel" ]; then
 	oops 2 "No modules found for kernel $kernel_version"
         return
     fi
Index: b/scripts/setup-sharedlibs.sh
===================================================================
--- a/scripts/setup-sharedlibs.sh
+++ b/scripts/setup-sharedlibs.sh
@@ -29,18 +29,18 @@ shared_object_files() {
 	    # kernel address space transition) in 2.6 kernels.
 	    continue ;;
 	/*)
-	    lib="${lib:1}" ;;
+	    ;;
 	*)
 	    # Library could not be found.
 	    oops 7 "Dynamic library $lib not found"
 	    continue ;;
 	esac
 
-	while [ -L "/$lib" ]; do
+	while [ -L "$lib" ]; do
 	    echo $lib
-	    link="$(readlink "/$lib")"
+	    link="$(readlink "$lib")"
 	    if [ x"${link:0:1}" == x"/" ]; then
-	        lib=${link#/}
+	        lib=$link
 	    else
 	        lib="${lib%/*}/$link"
 	    fi
@@ -63,7 +63,7 @@ if [ -n "$lib_files" ]; then
     case "$(uname -m)" in
 	alpha|ia64)
 	    mkdir -p $tmp_mnt/lib
-	    lib_files="$lib_files `echo $root_dir/lib/libnss_files* $root_dir/lib/libgcc_s.so*`"
+	    lib_files="$lib_files `echo /lib/libnss_files* /lib/libgcc_s.so*`"
 	    ;;
 	*)
 	    # no symlinks, most point into the running system
@@ -72,11 +72,11 @@ if [ -n "$lib_files" ]; then
 		case "$i" in
 		    32-bit)
 			mkdir -p $tmp_mnt/lib
-			lib_files="$lib_files `echo $root_dir/lib/libnss_files* $root_dir/lib/libgcc_s.so*`"
+			lib_files="$lib_files `echo /lib/libnss_files* /lib/libgcc_s.so*`"
 			;;
 		    64-bit)
 			mkdir -p $tmp_mnt/lib64
-			lib_files="$lib_files `echo $root_dir/lib64/libnss_files* $root_dir/lib64/libgcc_s.so*`"
+			lib_files="$lib_files `echo /lib64/libnss_files* /lib64/libgcc_s.so*`"
 			;;
 		esac
 	    done
@@ -85,7 +85,7 @@ if [ -n "$lib_files" ]; then
 
     for lib in $lib_files ; do
 	if [ -f $lib ] ; then
-	    verbose -n "${lib##$root_dir/} "
+	    verbose -n "$lib "
 	    cp -dp --parents $lib $tmp_mnt
 	fi
     done
Index: b/scripts/setup-storage.sh
===================================================================
--- a/scripts/setup-storage.sh
+++ b/scripts/setup-storage.sh
@@ -156,7 +156,7 @@ update_blockdev() {
 	
 	blockmajor=-1
 	blockminor=-1
-	if [ -e "$root_dir/${curblockdev#/}" ]; then
+	if [ -b "$root_dir/${curblockdev#/}" ]; then
 		blockdevn="$(devnumber $root_dir/${curblockdev#/})"
 		blockmajor="$(devmajor $blockdevn)"
 		if [ ! "$blockmajor" ]; then
@@ -194,7 +194,7 @@ resolve_device() {
     local x="$2"
     local realrootdev="$2"
 
-    [ "$2" ] || exit 0
+    [ -b "$2" ] || exit 0
 
     case "$realrootdev" in
       LABEL=*|UUID=*)
@@ -290,8 +290,11 @@ if [ "$rootfsopts" -a -z "$journaldev" ]
 fi
 
 # WARNING: dirty hack to get the resume device of the current system
-for o in $(cat /proc/cmdline); do
+for o in $(cat /proc/cmdline) $kernel_command_line; do
     case "$o" in
+    noresume)
+	resumedev=
+	;;
     resume=*)
 	resumedev=${o##resume=}
 	;;

Places

File base-patches.diff of Package mkinitrd (Revision 9b5606ec10b07243161b45d68be9520b)

Places