Diff of /tags/grubby-8_40_20170706/new-kernel-pkg

Parent Directory | Revision Log | Patch

	revision 2686 by niro, Wed Jul 16 10:40:51 2014 UTC	revision 3006 by niro, Tue Jun 27 14:26:38 2017 UTC
#	Line 79  grubConfig=""	Line 79  grubConfig=""
79	grub2Config=""	grub2Config=""
80	grub2EfiConfig=""	grub2EfiConfig=""
81	extlinuxConfig=""	extlinuxConfig=""
82		ubootScript="/boot/boot.scr"
83
84	ARCH=$(uname -m)	ARCH=$(uname -m)
85
#	Line 154  mbkernel="${HYPERVISOR}"	Line 155  mbkernel="${HYPERVISOR}"
155	mbargs="${HYPERVISOR_ARGS}"	mbargs="${HYPERVISOR_ARGS}"
156	adddracutargs=""	adddracutargs=""
157	addplymouthinitrd=""	addplymouthinitrd=""
158		DEBUGARG="systemd.log_level=debug systemd.log_target=kmsg"
159
160	usage()	usage()
161	{	{
#	Line 163  usage()	Line 165  usage()
165	echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2	echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
166	echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2	echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
167	echo "       [--add-plymouth-initrd]" >&2	echo "       [--add-plymouth-initrd]" >&2
168	echo "       [--host-only] [--devtree=<devicetree.dtb>]" >&2	echo "       [--host-only] [--devtree=<devicetree.dtb>] [--devtreedir=</devicetree/path/>]" >&2
169	echo "       <--install | --remove | --update> <kernel-version>" >&2	echo "       <--install | --remove | --update> <kernel-version>" >&2
170	echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2	echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
171	exit 1	exit 1
172	}	}
173
174		rungrubby()
175		{
176		if [[ $1 == --debug ]]
177		then
178		[[ ${MAKEDEBUG} != yes ]] && return 0
179		[[ -n ${verbose} ]] && echo "- First, making a debug entry."
180		if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
181		then
182		declare -x debugtitle="_with_debugging"
183		else
184		declare -x debugtitle=" with debugging"
185		fi
186		declare -x debugargs="${DEBUGARG}"
187		shift
188		else
189		[[ -n ${verbose} ] && echo "- Making a normal entry."
190		fi
191		$(eval $grubby $@)
192		export -n debugargs
193		export -n debugtitle
194		unset debugargs
195		unset debugtitle
196		}
197
198		set_title()
199		{
200		if [[ -n ${banner} ]]
201		then
202		if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
203		then
204		title=$(echo ${banner} | sed 's/ /_/g')
205		else
206		title="${banner} [ ${version} ]"
207		fi
208		elif [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
209		then
210		title=$(echo ${version} | sed 's/ /_/g')
211		elif [ -f /etc/os-release ]
212		then
213		title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
214		elif [ -f /etc/mageversion ]
215		then
216		title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
217		else
218		title="Magellan Linux [ ${version} ]"
219		fi
220		}
221
222	install()	install()
223	{	{
224	# XXX kernel should be able to be specified also (or work right on ia64)	# XXX kernel should be able to be specified also (or work right on ia64)
#	Line 191  install()	Line 241  install()
241	fi	fi
242
243	DEVTREE=""	DEVTREE=""
244	if [ -f ${devtreefile} ]	if [[ -n ${devtreefile} ]] && [ -f ${devtreefile} ]
245	then	then
246	[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"	[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
247	DEVTREE="--devtree ${devtreefile}"	DEVTREE="--devtree ${devtreefile}"
248	fi	fi
249
250		DEVTREEDIR=""
251		if [[ -n ${devtreedir} ]] && [ -d ${devtreedir} ]
252		then
253		[ -n ${verbose} ] && echo "found ${devtreedir} and using it with grubby"
254		DEVTREEDIR="--devtreedir ${devtreedir}"
255		fi
256
257	# FIXME: is this a good heuristic to find out if we're on iSeries?	# FIXME: is this a good heuristic to find out if we're on iSeries?
258	if [ -d /proc/iSeries ]	if [ -d /proc/iSeries ]
259	then	then
#	Line 226  install()	Line 283  install()
283	cfgLilo=""	cfgLilo=""
284	fi	fi
285
286	if [[ -n ${banner} ]]	set_title
	then
	if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
	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 ]
	then
	title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
	else
	title="Magellan Linux [ ${version} ]"
	fi
287
288	if [[ -n ${cfgGrub} ]]	if [[ -n ${cfgGrub} ]]
289	then	then
290	[[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"	[[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"
291
292	${grubby} --grub -c ${grubConfig} \	ARGS="--grub -c ${grubConfig} --add-kernel=${kernelImage} ${INITRD} \
293	--add-kernel=${kernelImage} \	${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
294	${INITRD} --copy-default ${makedefault} --title "${title}" \	${mbargs:+--mbargs=\"${mbargs}\"} \
295	${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \	--title=\"${title}\${debugtitle}\" --copy-default \
296	--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"	--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
297		--remove-kernel=\"TITLE=${title}\${debugtitle}\""
298		rungrubby ${ARGS} ${makedefault}
299		rungrubby --debug ${ARGS}
300	else	else
301	[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"	[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
302	fi	fi
#	Line 263  install()	Line 304  install()
304	then	then
305	[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"	[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
306
307	${grubby} --grub2 -c ${grub2Config} \	ARGS="--grub2 -c ${grub2Config} --add-kernel=${kernelImage} ${INITRD} \
308	--add-kernel=${kernelImage} \	--copy-default --title \"${title}\${debugtitle}\" \
309	${INITRD} --copy-default ${makedefault} --title "${title}" \	${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
310	${mbkernel:+--add-multiboot="${mbkernel}"} \	${mbargs:+--mbargs=\"${mbargs}\"} \
311	${mbargs:+--mbargs="${mbargs}"} \	--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
312	--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"	--remove-kernel=\"TITLE=${title}\${debugtitle}\""
313		rungrubby ${ARGS} ${makedefault}
314		rungrubby --debug ${ARGS}
315	else	else
316	[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"	[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
317	fi	fi
#	Line 276  install()	Line 319  install()
319	then	then
320	[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"	[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
321
322	${grubby} --grub2 -c ${grub2EfiConfig} --efi \	ARGS="--grub2 -c ${grub2EfiConfig} --efi \
323	--add-kernel=${kernelImage} ${DEVTREE} \	--add-kernel=${kernelImage} ${DEVTREE} ${INITRD} \
324	${INITRD} --copy-default ${makedefault} --title "${title}" \	--copy-default --title \"${title}\${debugtitle}\" \
325	${mbkernel:+--add-multiboot="${mbkernel}"} \	${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
326	${mbargs:+--mbargs="${mbargs}"} \	${mbargs:+--mbargs=\"${mbargs}\"} \
327	--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"	--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
328		--remove-kernel=\"TITLE=${title}\${debugtitle}\""
329		rungrubby ${ARGS} ${makedefault}
330		rungrubby --debug ${ARGS}
331	else	else
332	[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"	[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
333	fi	fi
#	Line 290  install()	Line 336  install()
336	then	then
337	[[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"	[[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"
338
339	${grubby} --add-kernel=${kernelImage} ${INITRD} \	ARGS="--${liloFlag} --add-kernel=${kernelImage} ${INITRD} \
340	--copy-default ${makedefault} --title "${title}" \	--copy-default --title \"${title}\${debugtitle}\" \
341	${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \	${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
342	--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \	${mbargs:+--mbargs=\"${mbargs}\"} \
343	--${liloFlag}	--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
344		--remove-kernel=\"TITLE=${version}\""
345		rungrubby ${ARGS} ${makedefault}
346		rungrubby --debug ${ARGS}
347
348	if [[ -n ${runLilo} ]]	if [[ -n ${runLilo} ]]
349	then	then
#	Line 314  install()	Line 363  install()
363	then	then
364	[[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"	[[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
365
366	${grubby} --extlinux -c ${extlinuxConfig} \	ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \
367	--add-kernel=${kernelImage} \	${DEVTREEDIR} ${DEVTREE} \
368	${INITRD} --copy-default ${makedefault} --title "${title}" \	${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
369	${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \	${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
370	--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"	${mbargs:+--mbargs=\"${mbargs}\"} \
371		--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
372		--remove-kernel=\"TITLE=${title}\${debugtitle}\""
373		rungrubby ${ARGS} ${makedefault}
374		rungrubby --debug ${ARGS}
375	else	else
376	[[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"	[[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
377	fi	fi
#	Line 451  update()	Line 504  update()
504	return	return
505	fi	fi
506
507		set_title
508
509	INITRD=""	INITRD=""
510	if [ -f ${initrdfile} ]	if [ -f ${initrdfile} ]
511	then	then
#	Line 463  update()	Line 518  update()
518	fi	fi
519	fi	fi
520
521		DEVTREE=""
522		if [[ -n ${devtreefile} ]] && [ -f ${devtreefile} ]
523		then
524		[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
525		DEVTREE="--devtree ${devtreefile}"
526		fi
527
528		DEVTREEDIR=""
529		if [[ -n ${devtreedir} ]] && [ -d ${devtreedir} ]
530		then
531		[[ -n ${verbose} ]] && echo "found ${devtreedir} and using it with grubby"
532		DEVTREEDIR="--devtreedir ${devtreedir}"
533		fi
534
535	if [[ -n ${cfgGrub} ]]	if [[ -n ${cfgGrub} ]]
536	then	then
537	[[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"	[[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
538	${grubby} --grub -c ${grubConfig} \	ARGS="--grub -c ${grubConfig} --update-kernel=${kernelImage} ${INITRD} \
539	--update-kernel=${kernelImage} \	${kernargs:+--args=\"${kernargs}\"} \
540	${INITRD} \	${removeargs:+--remove-args=\"${removeargs}\"} \
541	${kernargs:+--args="${kernargs}"} \	${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
542	${removeargs:+--remove-args="${removeargs}"} \	--title=\"${title}\${debugtitle}\""
543	${mbkernel:+--add-multiboot="${mbkernel}"}	rungrubby ${ARGS}
544		rungrubby --debug ${ARGS}
545	else	else
546	[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"	[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
547	fi	fi
#	Line 479  update()	Line 549  update()
549	if [[ -n ${cfgGrub2} ]]	if [[ -n ${cfgGrub2} ]]
550	then	then
551	[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"	[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
552	${grubby} --grub2 -c ${grub2Config} \	ARGS="--grub2 -c ${grub2Config} --update-kernel=${kernelImage} ${INITRD} \
553	--update-kernel=${kernelImage} \	${kernargs:+--args=\"${kernargs}\"} \
554	${INITRD} \	${removeargs:+--remove-args=\"${removeargs}\"} \
555	${kernargs:+--args="${kernargs}"} \	--title=\"${title}\${debugtitle}\""
556	${removeargs:+--remove-args="${removeargs}"}	rungrubby ${ARGS}
557		rungrubby --debug ${ARGS}
558	else	else
559	[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"	[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
560	fi	fi
#	Line 491  update()	Line 562  update()
562	if [[ -n ${cfgGrub2Efi} ]]	if [[ -n ${cfgGrub2Efi} ]]
563	then	then
564	[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"	[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
565	${grubby} --grub2 -c ${grub2EfiConfig} --efi \	ARGS="--grub2 -c ${grub2EfiConfig} --efi --update-kernel=${kernelImage} \
566	--update-kernel=${kernelImage} \	${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
567	${INITRD} \	${removeargs:+--remove-args=\"${removeargs}\"} \
568	${kernargs:+--args="${kernargs}"} \	--title=\"${title}\${debugtitle}\""
569	${removeargs:+--remove-args="${removeargs}"}	rungrubby ${ARGS}
570		rungrubby --debug ${ARGS}
571	else	else
572	[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"	[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
573	fi	fi
#	Line 503  update()	Line 575  update()
575	if [[ -n ${cfgLilo} ]]	if [[ -n ${cfgLilo} ]]
576	then	then
577	[[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"	[[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
578	${grubby} --update-kernel=${kernelImage} \	ARGS="--${liloFlag} --update-kernel=${kernelImage} ${INITRD} \
579	${INITRD} \	${kernargs:+--args=\"${kernargs}\"} \
580	${kernargs:+--args="${kernargs}"} \	${removeargs:+--remove-args=\"${removeargs}\"} \
581	${removeargs:+--remove-args="${removeargs}"} \	--title=\"${title}\${debugtitle}\""
582	--${liloFlag}	rungrubby ${ARGS}
583		rungrubby --debug ${ARGS}
584
585	if [[ -n ${runLilo} ]]	if [[ -n ${runLilo} ]]
586	then	then
#	Line 560  update()	Line 633  update()
633	if [[ -n ${cfgExtlinux} ]]	if [[ -n ${cfgExtlinux} ]]
634	then	then
635	[[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"	[[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
636	${grubby} --extlinux -c ${extlinuxConfig} \	ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \
637	--update-kernel=${kernelImage} \	${DEVTREE} ${DEVTREEDIR} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
638	${INITRD} \	${removeargs:+--remove-args=\"${removeargs}\"} \
639	${kernargs:+--args="${kernargs}"} \	--title=\"${title}\${debugtitle}\""
640	${removeargs:+--remove-args="${removeargs}"}	rungrubby ${ARGS}
641		rungrubby --debug ${ARGS}
642	else	else
643	[[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"	[[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
644	fi	fi
#	Line 610  doRmmoddep()	Line 684  doRmmoddep()
684	fi	fi
685	}	}
686
687		# kernel image for 2.4 is kernel
688		if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
689		then
690		if [[ ${kernelmajor} = 2.4 ]]
691		then
692		kernelName=kernel
693		fi
694		fi
695
696	while [ $# -gt 0 ]	while [ $# -gt 0 ]
697	do	do
#	Line 632  do	Line 714  do
714	fi	fi
715	;;	;;
716
717		--devtreedir*)
718		if [[ $1 == --devtreedir\=* ]]
719		then
720		devtreedir=${1#--devtreedir=}
721		else
722		devtreedir=$2
723		shift
724		fi
725		;;
726
727	--dracut)	--dracut)
728	dracut=--dracut	dracut=--dracut
729	;;	;;
#	Line 747  do	Line 839  do
839	fi	fi
840	;;	;;
841
842		--kernel-name*)
843		if [[ $1 == --kernel-name\=* ]]
844		then
845		kernelName=${1#--kernel-name=}
846		else
847		kernelName="$2"
848		shift
849		fi
850		;;
851
852	-v)	-v)
853	verbose=-v	verbose=-v
854	;;	;;
#	Line 785  fi	Line 887  fi
887
888	kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)	kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)
889
	# kernel image for 2.4 is kernel
	if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
	then
	if [[ ${kernelmajor} = 2.4 ]]
	then
	kernelName=kernel
	fi
	fi
890	[[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"	[[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"
891
892	# set the initrd file based on arch; ia64 is the only currently known oddball	# set the initrd file based on arch; ia64 is the only currently known oddball
#	Line 814  then	Line 907  then
907	fi	fi
908	[[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"	[[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"
909
910	# add dracut i18n, keyboard and plymouth kernel args if requested	if [[ ${ARCH} =~ armv[5|7].*l ]]
	if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
911	then	then
912	if [ -r /etc/vconsole.conf ]	if [[ -z ${SHIPSDTB} ]] || [[ ${SHIPSDTB} != yes ]]
913	then	then
914	. /etc/vconsole.conf	if [[ -n ${dtbfile} ]] && [ -f ${bootPrefix}/dtb-${version}/${dtbfile} ]
	for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE
	do
	val=$(eval echo \$$i)
	[[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}"
	done
	else
	if [ -r /etc/conf.d/consolefont ]
915	then	then
916	. /etc/conf.d/consolefont	devtreefile="${bootPrefix}/dtb-${version}/${dtbfile}"
917		[[ -n ${verbose} ]] && echo "devtreefile is ${devtreefile}"
918	if [[ -n ${CONSOLEFONT} ]]	elif [ -d ${bootPrefix}/dtb-${version}/ ]
	then
	kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
	fi
	fi
	if  [ -r /etc/conf.d/keymap ]
919	then	then
920	. /etc/conf.d/keymap	devtreedir="${bootPrefix}/dtb-${version}/"
921		[[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
	if [[ -n ${KEYMAP} ]]
	then
	kernargs="${kernargs} KEYTABLE=${KEYMAP}"
	fi
922	fi	fi
923	fi	fi
924		fi
925		[[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
926
927	if [ -r /etc/locale.conf ]	# add dracut kernel args if requested
928	then	if [[ -n ${dracut} ]] && [[ -n ${adddracutargs} ]]
929	. /etc/locale.conf	[ -r /etc/vconsole.conf ] && . /etc/vconsole.conf
930		[ -r /etc/locale.conf ] && . /etc/locale.conf
931
932	if [[ -n ${LANG} ]]	while read opt rd_opt
933	then	do
934	kernargs="${kernargs} LANG=${LANG}"	[ -n "${!opt}" ] && kernargs="$kernargs $rd_opt=\"${!opt}\""
935	fi	done <<< 'KEYMAP rd.vconsole.keymap
936	fi	FONT rd.vconsole.font
937		FONT_MAP rd.vconsole.font.map
938		FONT_UNIMAP rd.vconsole.font.unimap
939		UNICODE rd.vconsole.font.unicode
940		EXT_KEYMAP rd.vconsole.keymap.ext
941		LANG rd.locale.LANG
942		LC_ALL rd.locale.LC_ALL'
943	fi	fi
944
945	# set this as the default if we have the package and it matches	# set this as the default if we have the package and it matches
946	if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&	if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] && [[ -n ${DEFAULTKERNEL} ]]
	[[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]
947	then	then
948	makedefault="--make-default"	if [[ ${package} = ${DEFAULTKERNEL} ]] || [[ ${package}-core = ${DEFAULTKERNEL} ]]
949	[[ -n ${verbose} ]] && echo "making it the default based on config"	then
950		makedefault="--make-default"
951		[[ -n ${verbose} ]] && echo "making it the default based on config"
952		fi
953	fi	fi
954
955	if [[ ${moddep} = make ]]	if [[ ${moddep} = make ]]
#	Line 949  fi	Line 1034  fi
1034	# if we mounted the U-Boot directory, unmount it.	# if we mounted the U-Boot directory, unmount it.
1035	[[ -n ${mounted} ]] && umount ${ubootDir}	[[ -n ${mounted} ]] && umount ${ubootDir}
1036
1037		# make sure changes make it to the disk.
1038		# if /boot is a mountpoint, force the meta data on disk
1039		# to by-pass writeback delay.
1040		# PPC64LE-only to deal with Petitboot issues
1041		if [[ ${ARCH} = ppc64le ]]
1042		then
1043		sync && mountpoint -q /boot && fsfreeze -f /boot && fsfreeze -u /boot
1044		fi
1045
1046	exit 0	exit 0

---

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

Legend: Removed from v.2686   changed lines   Added in v.3006