Bug#266101: [georg.wittenburg@gmx.net: Debian Grub Patch]

[Jason Thomas]

----- Forwarded message from Georg Wittenburg <georg.wittenburg@gmx.net> -----

> Date: Sat, 22 Jan 2005 12:00:14 +0100
> From: Georg Wittenburg <georg.wittenburg@gmx.net>
> To: Jason Thomas <jason@debian.org>
> Subject: Debian Grub Patch
> 
> Dear Jason,
> 
> I'd really appreciate if you could spent two minutes fixing bug #266101 in the 
> Debian grub package by applying the patch below.
> 
> Thanks a lot!
>    Georg
> 
> -- 
> Georg Wittenburg
> http://page.mi.fu-berlin.de/~wittenbu/

> --- update-grub.orig	2004-12-09 23:57:43.000000000 +0100
> +++ update-grub		2004-12-10 00:11:06.000000000 +0100
> @@ -256,6 +256,10 @@ fi
>  # should grub lock the alternative boot options in the menu
>  	lockalternative="false"
>  
> +# additional options to use with the default boot option, but not with the
> +# alternatives
> +	defoptions=""
> +
>  # options to use with the alternative boot options
>  	altoptions="(recovery mode) single"
>  
> @@ -596,6 +600,9 @@ alternative=$(GetMenuOpt "alternative" "
>  # Extract the lockalternative value
>  lockalternative=$(GetMenuOpt "lockalternative" "$lockalternative")
>  
> +# Extract the additional default options
> +defoptions=$(GetMenuOpt "defoptions" "$defoptions")
> +
>  # Extract the howmany value
>  howmany=$(GetMenuOpt "howmany" "$howmany")
>  
> @@ -640,6 +647,12 @@ echo "##      lockalternative=false" >> 
>  echo "# lockalternative=$lockalternative" >> $buffer
>  echo >> $buffer
>  
> +echo "## additional options to use with the default boot option, but not with the" >> $buffer
> +echo "## alternatives" >> $buffer
> +echo "## e.g. defoptions=vga0x305 resume=/dev/hda5" >> $buffer
> +echo "# defoptions=$defoptions" >> $buffer
> +echo >> $buffer
> +
>  echo "## altoption boot targets option" >> $buffer
>  echo "## multiple altoptions lines are allowed" >> $buffer
>  echo "## e.g. altoptions=(extra menu suffix) extra boot options" >> $buffer
> @@ -755,7 +768,7 @@ for kern in $sortedKernels ; do
>  	currentOpt=$(get_kernel_opt $kernelVersion)
>  
>  	write_kernel_entry "$kernelVersion" "" "" "$grub_root_device" "$kernel" \
> -	"$currentOpt" "" "$initrd"
> +	"$currentOpt" "$defoptions" "$initrd"
>  
>  	# insert the alternative boot options
>  	if test ! x"$alternative" = x"false" ; then




----- End forwarded message -----

-- 
Jason

"I hope you learn speaking English proper I hope speak I me you."
     -- Branden Robinson, 2001