Attachment 102264 Details for Bug 205550

[patch] lilo-pegasos.patch

lilo-pegasos.patch (text/plain), 3.56 KB, created by Olaf Hering on 2006-10-23 11:29:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Hering

Created: 2006-10-23 11:29:29 UTC

Size: 3.56 KB

patch

obsolete

>Index: lilo/lilo.new
>===================================================================
>--- lilo/lilo.new	(revision 831)
>+++ lilo/lilo.new	(working copy)
>@@ -500,6 +500,10 @@ function running_on_prep () {
>     running_on_prep;
> }
> 
>+function running_on_pegasos () {
>+    source /lib/lilo/lilo-chrp.lib
>+    running_on_pegasos;
>+}
> 
> function running_on_pmac_old () {
>     source /lib/lilo/lilo-pmac.lib
>@@ -689,11 +693,11 @@ function check_config_file () {
> 	#   work around a YaST bug, which comes from a certain kind of
> 	#   intel-architecture blindness, some architectures can guess boot
> 	#   drive :-)
>-	if [[ "$MACHINE" != @(chrp|prep) ]]; then
>+	if [[ "$MACHINE" != @(chrp|prep|pegasos) ]]; then
> 	    error "boot=<partition> is not specified!"
> 	fi
>     else
>-	if [ "$MACHINE" != "iseries" ]; then
>+	if [ "$MACHINE" != "iseries" -a "$MACHINE"  != "pegasos" ]; then
> 	    if [ ! -b $OPTION_BOOT ]; then
> 		error "boot = $OPTION_BOOT is not a valid block device"
> 	    fi
>@@ -785,6 +789,7 @@ case "$MACHINE" in
>     chrp)      running_on_chrp     ;;
>     prep)      running_on_prep     ;;
>     iseries)   running_on_iseries  ;;
>+    pegasos)   running_on_pegasos  ;;
> esac
> 
> #
>Index: lilo/lilo-chrp.lib
>===================================================================
>--- lilo/lilo-chrp.lib	(revision 831)
>+++ lilo/lilo-chrp.lib	(working copy)
>@@ -7,6 +7,7 @@
> unset firmware_status
> unset running_on_chrp
> unset running_on_prep
>+unset running_on_pegaos
> 
> FW_STATUS_FILE=/lib/lilo/chrp/firmware_status.chrp
> 
>@@ -831,6 +832,60 @@ function running_on_prep () {
>     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:

Actions: View | Diff

Attachments on bug 205550: 102264