Attachment #102264 for bug #205550

View | Details | Raw Unified | Return to bug 205550
Collapse All | Expand All

Lines 500-505 function running_on_prep () { Link Here

(-)lilo/lilo.new (-2 / +7 lines)
500	running_on_prep;	500	running_on_prep;
501	}	501	}
502		502
		503	function running_on_pegasos () {
		504	source /lib/lilo/lilo-chrp.lib
		505	running_on_pegasos;
		506	}
503		507
504	function running_on_pmac_old () {	508	function running_on_pmac_old () {
505	source /lib/lilo/lilo-pmac.lib	509	source /lib/lilo/lilo-pmac.lib
Lines 689-699 function check_config_file () { Link Here
689	# work around a YaST bug, which comes from a certain kind of	693	# work around a YaST bug, which comes from a certain kind of
690	# intel-architecture blindness, some architectures can guess boot	694	# intel-architecture blindness, some architectures can guess boot
691	# drive :-)	695	# drive :-)
692	if [[ "$MACHINE" != @(chrp\|prep) ]]; then	696	if [[ "$MACHINE" != @(chrp\|prep\|pegasos) ]]; then
693	error "boot=<partition> is not specified!"	697	error "boot=<partition> is not specified!"
694	fi	698	fi
695	else	699	else
696	if [ "$MACHINE" != "iseries" ]; then	700	if [ "$MACHINE" != "iseries" -a "$MACHINE" != "pegasos" ]; then
697	if [ ! -b $OPTION_BOOT ]; then	701	if [ ! -b $OPTION_BOOT ]; then
698	error "boot = $OPTION_BOOT is not a valid block device"	702	error "boot = $OPTION_BOOT is not a valid block device"
699	fi	703	fi
Lines 785-790 case "$MACHINE" in Link Here
785	chrp) running_on_chrp ;;	789	chrp) running_on_chrp ;;
786	prep) running_on_prep ;;	790	prep) running_on_prep ;;
787	iseries) running_on_iseries ;;	791	iseries) running_on_iseries ;;
		792	pegasos) running_on_pegasos ;;
788	esac	793	esac
789		794
790	#	795	#




unset firmware_status
unset running_on_chrp
unset running_on_prep
unset running_on_pegaos

FW_STATUS_FILE=/lib/lilo/chrp/firmware_status.chrp


    dd if="$TEMP/zImage.prep" of=$P 2>/dev/null
}

function running_on_pegasos () {
	echo running on pegasos

	# build the temp yaboot.conf

	for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
		test -z ${CONFIG_IMAGE_FILE[$i]} && continue
		test "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" && continue
		CONFIG_IMAGE_PATH[$i]=$( get_of_path ${CONFIG_IMAGE_FILE[$i]} )
		if [ -n "${CONFIG_IMAGE_INITRD[$i]}" ] ; then 
			CONFIG_IMAGE_INITRDPATH[$i]=$( get_of_path ${CONFIG_IMAGE_INITRD[$i]} )
		fi
	done

	# starting the work
	{
		test -z "$OPTION_TIMEOUT" || echo "timeout = $OPTION_TIMEOUT"
		test -z "$OPTION_DEFAULT" || echo "default = $OPTION_DEFAULT"
		test -z "$OPTION_ROOT"    || echo "root = $OPTION_ROOT"
		test -z "$OPTION_APPEND"  || echo "append = \"$OPTION_APPEND\""
		test -z "$OPTION_INITRD"  || echo "initrd = $OPTION_INITRD"

		for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
			[ "${CONFIG_IMAGE_OTHER[$i]}" ] &&  continue
			[ "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" ] && continue
			echo "image = ${CONFIG_IMAGE_PATH[$i]}"
			test -z "${CONFIG_IMAGE_LABEL[$i]}"  || echo "    label = ${CONFIG_IMAGE_LABEL[$i]}"
			test -z "${CONFIG_IMAGE_ROOT[$i]}"   || echo "    root = ${CONFIG_IMAGE_ROOT[$i]}"
			test -z "${CONFIG_IMAGE_APPEND[$i]}" || echo "    append = \"${CONFIG_IMAGE_APPEND[$i]}\""
			test -z "${CONFIG_IMAGE_INITRD[$i]}" || echo "    initrd = ${CONFIG_IMAGE_INITRDPATH[$i]}" 
		done
	} > $TEMP/yaboot.conf

	echo "yaboot will use a buit-in yaboot.conf with SmartFirmware version 1.2"
	/lib/lilo/scripts/make_yaboot.sh \
		--configfile $TEMP/yaboot.conf \
		--tmp $TEMP \
		--output $TEMP/yaboot

	if [ -z "$OPTION_BOOT" ] ; then
		rm -fv /yaboot
		cp -v $TEMP/yaboot /yaboot
	else
		if [ -f "$OPTION_BOOT" -o ! -e "$OPTION_BOOT" ] ; then
			rm -fv "$OPTION_BOOT"
			cp -v $TEMP/yaboot $OPTION_BOOT
		fi
	fi
	if [ "$OPTION_ACTIVATE" = "yes" ] ; then
		NV_BOOT_PATH=$(get_of_path $OPTION_BOOT)
		echo "set OF boot-device '$NV_BOOT_PATH' does not work yet on Pegasos."
	fi
}

#
#
# Local variables:

Return to bug 205550

Lines 7-12 Link Here

(-)lilo/lilo-chrp.lib (+55 lines)
7	unset firmware_status	7	unset firmware_status
8	unset running_on_chrp	8	unset running_on_chrp
9	unset running_on_prep	9	unset running_on_prep
		10	unset running_on_pegaos
10		11
11	FW_STATUS_FILE=/lib/lilo/chrp/firmware_status.chrp	12	FW_STATUS_FILE=/lib/lilo/chrp/firmware_status.chrp
12		13
Lines 831-836 function running_on_prep () { Link Here
831	dd if="$TEMP/zImage.prep" of=$P 2>/dev/null	832	dd if="$TEMP/zImage.prep" of=$P 2>/dev/null
832	}	833	}
833		834
		835	function running_on_pegasos () {
		836	echo running on pegasos
		837
		838	# build the temp yaboot.conf
		839
		840	for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
		841	test -z ${CONFIG_IMAGE_FILE[$i]} && continue
		842	test "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" && continue
		843	CONFIG_IMAGE_PATH[$i]=$( get_of_path ${CONFIG_IMAGE_FILE[$i]} )
		844	if [ -n "${CONFIG_IMAGE_INITRD[$i]}" ] ; then
		845	CONFIG_IMAGE_INITRDPATH[$i]=$( get_of_path ${CONFIG_IMAGE_INITRD[$i]} )
		846	fi
		847	done
		848
		849	# starting the work
		850	{
		851	test -z "$OPTION_TIMEOUT" \|\| echo "timeout = $OPTION_TIMEOUT"
		852	test -z "$OPTION_DEFAULT" \|\| echo "default = $OPTION_DEFAULT"
		853	test -z "$OPTION_ROOT" \|\| echo "root = $OPTION_ROOT"
		854	test -z "$OPTION_APPEND" \|\| echo "append = \"$OPTION_APPEND\""
		855	test -z "$OPTION_INITRD" \|\| echo "initrd = $OPTION_INITRD"
		856
		857	for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do
		858	[ "${CONFIG_IMAGE_OTHER[$i]}" ] && continue
		859	[ "${CONFIG_IMAGE_OPTIONAL[$i]}" = "skip" ] && continue
		860	echo "image = ${CONFIG_IMAGE_PATH[$i]}"
		861	test -z "${CONFIG_IMAGE_LABEL[$i]}" \|\| echo " label = ${CONFIG_IMAGE_LABEL[$i]}"
		862	test -z "${CONFIG_IMAGE_ROOT[$i]}" \|\| echo " root = ${CONFIG_IMAGE_ROOT[$i]}"
		863	test -z "${CONFIG_IMAGE_APPEND[$i]}" \|\| echo " append = \"${CONFIG_IMAGE_APPEND[$i]}\""
		864	test -z "${CONFIG_IMAGE_INITRD[$i]}" \|\| echo " initrd = ${CONFIG_IMAGE_INITRDPATH[$i]}"
		865	done
		866	} > $TEMP/yaboot.conf
		867
		868	echo "yaboot will use a buit-in yaboot.conf with SmartFirmware version 1.2"
		869	/lib/lilo/scripts/make_yaboot.sh \
		870	--configfile $TEMP/yaboot.conf \
		871	--tmp $TEMP \
		872	--output $TEMP/yaboot
		873
		874	if [ -z "$OPTION_BOOT" ] ; then
		875	rm -fv /yaboot
		876	cp -v $TEMP/yaboot /yaboot
		877	else
		878	if [ -f "$OPTION_BOOT" -o ! -e "$OPTION_BOOT" ] ; then
		879	rm -fv "$OPTION_BOOT"
		880	cp -v $TEMP/yaboot $OPTION_BOOT
		881	fi
		882	fi
		883	if [ "$OPTION_ACTIVATE" = "yes" ] ; then
		884	NV_BOOT_PATH=$(get_of_path $OPTION_BOOT)
		885	echo "set OF boot-device '$NV_BOOT_PATH' does not work yet on Pegasos."
		886	fi
		887	}
		888
834	#	889	#
835	#	890	#
836	# Local variables:	891	# Local variables: