/[magellan-source]/trunk/grubby/new-kernel-pkg

Diff of /trunk/grubby/new-kernel-pkg

Parent Directory | Revision Log | View Patch Patch

-revision 2239 by niro,
Mon Oct 21 13:28:04 2013 UTC
+revision 2684 by niro,
Wed Jul 16 10:26:39 2014 UTC
 Line 116 
 elif [[ ${ARCH} =~ armv[5|7].*l ]]
  then
  	liloConfig=""
  	bootPrefix=/boot
+ 	extlinuxConfig=$(readlink -f /etc/extlinux.conf 2>/dev/null)
  	ubootDir=${UBOOT_DIR:-"/boot"}
  	ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
  	ubootKList=${UBOOT_KLIST:-"klist.txt"}
-Line 170 
 usage()
+Line 171 
 usage()
  install()
  {
  	# XXX kernel should be able to be specified also (or work right on ia64)
- 	if [ ! -f ${bootPrefix}/${kernelName}-${version} ]
+ 	if [ ! -f ${kernelImage} ]
  	then
  		[[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
  		return
-Line 195 
 install()
+Line 196 
 install()
  		if [[ -z ${initrdfile} ]]
  		then
  			[[ -n ${verbose} ]] && echo "No initrd, just adding system map"
- 			/sbin/addSystemMap ${bootPrefix}/System.map-${version} ${bootPrefix}/${kernelName}-${version} ${bootPrefix}/vmlinitrd-${version}
+ 			/sbin/addSystemMap ${bootPrefix}/System.map-${version} ${kernelImage} ${bootPrefix}/vmlinitrd-${version}
  		else
- 			/sbin/addSystemMap ${bootPrefix}/System.map-${version} ${bootPrefix}/${kernelName}-${version} ${bootPrefix}/vmlinux.sm-${version}
+ 			/sbin/addSystemMap ${bootPrefix}/System.map-${version} ${kernelImage} ${bootPrefix}/vmlinux.sm-${version}
  			/sbin/addRamDisk ${initrdfile} ${bootPrefix}/System.map-${version} ${bootPrefix}/vmlinux.sm-${version} ${bootPrefix}/vmlinitrd-${version} 2>/dev/null
  			rm ${bootPrefix}/vmlinux.sm-${version}
  		fi
-Line 219 
 install()
+Line 220 
 install()
  	if [[ -n ${banner} ]]
  	then
- 		title="${banner} [ ${version} ]"
+ 		if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
- 	elif [[ $(read_os_release id) = magellan ]]
+ 		then
+ 			title=$(echo ${banner} | sed 's/ /_/g')
+ 		else
+ 			title="${banner} [ ${version} ]"
+ 		fi
+ 	elif [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
+ 	then
+ 		title=$(echo ${version} | sed 's/ /_/g')
+ 	elif [ -f /etc/os-release ]
  	then
  		title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
  	elif [ -f /etc/mageversion ]
-Line 235 
 install()
+Line 244 
 install()
  		[[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"
  		${grubby} --grub -c ${grubConfig} \
- 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
+ 			--add-kernel=${kernelImage} \
  			${INITRD} --copy-default ${makedefault} --title "${title}" \
  			${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
  			--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
-Line 247 
 install()
+Line 256 
 install()
  		[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
  		${grubby} --grub2 -c ${grub2Config} \
- 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
+ 			--add-kernel=${kernelImage} \
  			${INITRD} --copy-default ${makedefault} --title "${title}" \
  			${mbkernel:+--add-multiboot="${mbkernel}"} \
  			${mbargs:+--mbargs="${mbargs}"} \
-Line 260 
 install()
+Line 269 
 install()
  		[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
  		${grubby} --grub2 -c ${grub2EfiConfig} --efi \
- 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
+ 			--add-kernel=${kernelImage} \
  			${INITRD} --copy-default ${makedefault} --title "${title}" \
  			${mbkernel:+--add-multiboot="${mbkernel}"} \
  			${mbargs:+--mbargs="${mbargs}"} \
-Line 273 
 install()
+Line 282 
 install()
  	then
  		[[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"
- 		${grubby} --add-kernel=${bootPrefix}/${kernelName}-${version} ${INITRD} \
+ 		${grubby} --add-kernel=${kernelImage} ${INITRD} \
- 			--copy-default ${makedefault} --title ${version} \
+ 			--copy-default ${makedefault} --title "${title}" \
  			${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
  			--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \
  			--${liloFlag}
-Line 298 
 install()
+Line 307 
 install()
  		[[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
  		${grubby} --extlinux -c ${extlinuxConfig} \
- 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
+ 			--add-kernel=${kernelImage} \
  			${INITRD} --copy-default ${makedefault} --title "${title}" \
  			${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
  			--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
-Line 313 
 remove()
+Line 322 
 remove()
  	if [ -d /proc/iSeries ]
  	then
  		[[ -n ${verbose} ]] && echo "On an iSeries, remove img file"
- 		rm -f ${bootPrefix}/${kernelName}-${version}.img 2>/dev/null
+ 		rm -f ${kernelImage}.img 2>/dev/null
  		return
  	fi
-Line 321 
 remove()
+Line 330 
 remove()
  	then
  		[[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
  		${grubby} --grub -c ${grubConfig} \
- 			--remove-kernel=${bootPrefix}/${kernelName}-${version}
+ 			--remove-kernel=${kernelImage}
  	else
  		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
  	fi
-Line 329 
 remove()
+Line 338 
 remove()
  	then
  		[[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
  		${grubby} --grub2 -c ${grub2Config} \
- 			--remove-kernel=${bootPrefix}/${kernelName}-${version}
+ 			--remove-kernel=${kernelImage}
  	else
  		[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
  	fi
-Line 337 
 remove()
+Line 346 
 remove()
  	then
  		[[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
  		${grubby} --grub2 -c ${grub2EfiConfig} --efi \
- 			--remove-kernel=${bootPrefix}/${kernelName}-${version}
+ 			--remove-kernel=${kernelImage}
  	else
  		[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
  	fi
-Line 345 
 remove()
+Line 354 
 remove()
  	if [[ -n ${cfgLilo} ]]
  	then
  		[[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"
- 		${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version} --${liloFlag}
+ 		${grubby} --remove-kernel=${kernelImage} --${liloFlag}
  		if [[ -n ${runLilo} ]]
  		then
-Line 404 
 remove()
+Line 413 
 remove()
  				fi
  				mv ${tmpKList} ${ubootDir}/${ubootKList}
+ 				[ -x /sbin/a-b-c ] && /sbin/a-b-c
  			else
  				[[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
  				[ -f ${tmpKList} ] && rm -f ${tmpKList}
-Line 419 
 remove()
+Line 429 
 remove()
  	then
  		[[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"
  		${grubby} --extlinux -c ${extlinuxConfig} \
- 			--remove-kernel=${bootPrefix}/${kernelName}-${version}
+ 			--remove-kernel=${kernelImage}
  	else
  		[[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
  	fi
-Line 427 
 remove()
+Line 437 
 remove()
  update()
  {
- 	if [ ! -f ${bootPrefix}/${kernelName}-${version} ]
+ 	if [ ! -f ${kernelImage} ]
  	then
  		[[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
  		return
-Line 449 
 update()
+Line 459 
 update()
  	then
  		[[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
  		${grubby} --grub -c ${grubConfig} \
- 			--update-kernel=${bootPrefix}/${kernelName}-${version} \
+ 			--update-kernel=${kernelImage} \
  			${INITRD} \
  			${kernargs:+--args="${kernargs}"} \
- 			${removeargs:+--remove-args="${removeargs}"}
+ 			${removeargs:+--remove-args="${removeargs}"} \
+ 			${mbkernel:+--add-multiboot="${mbkernel}"}
  	else
  		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
  	fi
-Line 461 
 update()
+Line 472 
 update()
  	then
  		[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
  		${grubby} --grub2 -c ${grub2Config} \
- 			--update-kernel=${bootPrefix}/${kernelName}-${version} \
+ 			--update-kernel=${kernelImage} \
  			${INITRD} \
  			${kernargs:+--args="${kernargs}"} \
  			${removeargs:+--remove-args="${removeargs}"}
-Line 473 
 update()
+Line 484 
 update()
  	then
  		[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
  		${grubby} --grub2 -c ${grub2EfiConfig} --efi \
- 			--update-kernel=${bootPrefix}/${kernelName}-${version} \
+ 			--update-kernel=${kernelImage} \
  			${INITRD} \
  			${kernargs:+--args="${kernargs}"} \
  			${removeargs:+--remove-args="${removeargs}"}
-Line 484 
 update()
+Line 495 
 update()
  	if [[ -n ${cfgLilo} ]]
  	then
  		[[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
- 		${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \
+ 		${grubby} --update-kernel=${kernelImage} \
  			${INITRD} \
  			${kernargs:+--args="${kernargs}"} \
  			${removeargs:+--remove-args="${removeargs}"} \
-Line 511 
 update()
+Line 522 
 update()
  		[[ -n ${verbose} ]] && echo "creating uImage-${version}"
  		mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \
  			-e ${ubootAddress} -n ${version} \
- 			-d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}
+ 			-d ${kernelImage} ${ubootDir}/uImage-${version}
  		[[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
  		mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \
-Line 530 
 update()
+Line 541 
 update()
  				[[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
  			fi
  			echo ${version} >> ${ubootDir}/${ubootKList}
+ 			[ -x /sbin/a-b-c ] && /sbin/a-b-c
  		else
  			[[ -n ${verbose} ]] && echo "cannot make ${version} the default"
  		fi
-Line 541 
 update()
+Line 553 
 update()
  	then
  		[[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
  		${grubby} --extlinux -c ${extlinuxConfig} \
- 			--update-kernel=${bootPrefix}/${kernelName}-${version} \
+ 			--update-kernel=${kernelImage} \
  			${INITRD} \
  			${kernargs:+--args="${kernargs}"} \
  			${removeargs:+--remove-args="${removeargs}"}
-Line 583 
 doDepmod()
+Line 595 
 doDepmod()
  doRmmoddep()
  {
  	[[ -n ${verbose} ]] && echo "removing modules.dep info for ${version}"
- 	[ -d /lib/modules/${version} ] && rm -f /lib/modules/${version}/modules.*
+ 	if [ -d /lib/modules/${version} ]
+ 	then
+ 		rm -f /lib/modules/${version}/modules.*.bin \
+ 			/lib/modules/${version}/modules.{alias,dep,devname,symbols,softdep}
+ 	fi
  }
-Line 607 
 do
+Line 623 
 do
  			;;
  		--initrdfile*)
- 			if echo $1 | grep '=' >/dev/null
+ 			if [[ $1 == --initrdfile\=* ]]
  			then
- 				initrdfile=$(echo $1 | sed 's/^--initrdfile=//')
+ 				initrdfile=${1#--initrdfile=}
  			else
  				initrdfile=$2
  				shift
-Line 617 
 do
+Line 633 
 do
  			;;
  		--kernel-args*)
- 			if echo $1 | grep '=' >/dev/null
+ 			if [[ $1 == --kernel-args\=* ]]
  			then
- 				kernargs=$(echo $1 | sed 's/^--kernel-args=//')
+ 				kernargs=${1#--kernel-args=}
  			else
  				kernargs=$2
  				shift
-Line 627 
 do
+Line 643 
 do
  			;;
  		--remove-args*)
- 			if echo $1 | grep '=' >/dev/null
+ 			if [[ $1 == --remove-args\=* ]]
  			then
- 				removeargs=$(echo $1 | sed 's/^--remove-args=//')
+ 				removeargs=${1#--remove-args=}
  			else
  				removeargs=$2
  				shift
-Line 637 
 do
+Line 653 
 do
  			;;
  		--banner*)
- 			if echo $1 | grep '=' >/dev/null
+ 			if [[ $1 == --banner\=* ]]
  			then
- 				banner=$(echo $1 | sed 's/^--banner=//')
+ 				banner=${1#--banner=}
  			else
  				banner=$2
  				shift
-Line 647 
 do
+Line 663 
 do
  			;;
  		--multiboot*)
- 			if echo $1 |grep '=' >/dev/null
+ 			if [[ $1 == --multiboot\=* ]]
  			then
- 				mbkernel=$(echo $1 | sed 's/^--multiboot=//')
+ 				mbkernel=${1#--multiboot=}
  			else
  				# can't really support having an optional second arg here
  				# sorry!
-Line 658 
 do
+Line 674 
 do
  			;;
  		--mbargs*)
- 			if echo $1 |grep '=' >/dev/null
+ 			if [[ $1 == --mbargs\=* ]]
  			then
- 				mbargs=$(echo $1 | sed 's/^--mbargs=//')
+ 				mbargs=${1#--mbargs=}
  			else
  				mbargs="$2"
  				shift
-Line 679 
 do
+Line 695 
 do
  			makedefault="--make-default"
  			;;
- 		--package)
+ 		--package*)
- 			if echo $1 | grep '=' >/dev/null
+ 			if [[ $1 == --package\=* ]]
  			then
- 				package=$(echo $1 | sed 's/^--package=//')
+ 				package=${1#--package=}
  			else
  				package=$2
  				shift
-Line 697 
 do
+Line 713 
 do
  			addplymouthinitrd=--add-plymouth-initrd
  			;;
+ 		--kernel-image*)
+ 			if [[ $1 == --kernel-image\=* ]]
+ 			then
+ 				kernelImage=${1#--kernel-image=}
+ 			else
+ 				kernelImage="$2"
+ 				shift
+ 			fi
+ 			if ! [[ -f ${kernelImage} ]]
+ 			then
+ 				echo "Can't find kernel image '${kernelImage}'" >&2
+ 				usage
+ 				exit 1
+ 			fi
+ 			;;
  		-v)
  			verbose=-v
  			;;
-Line 744 
 then
+Line 776 
 then
  	fi
  fi
+ [[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"
  # set the initrd file based on arch; ia64 is the only currently known oddball
  if [[ -z ${initrdfile} ]]
  then

 Legend:



Removed from v.2239
 


changed lines


 
Added in v.2684
 Legend:



Removed from v.2239
 


changed lines


 
Added in v.2684
-Removed from v.2239
+Added in v.2684