Bug#266101: Updated Patch

[Georg Wittenburg]

--nextPart4429951.09OHlJMrML
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Hi!

This is the patch updated to grub 0.95+cvs20040624-17.

I do hope that after the release of Sarge someone will finally get around t=
o=20
make the time to apply these few lines, or at least let me know whether=20
there's a good reason not to do so. It's really frustrating to see new=20
revisions of grub without this patch but still not getting the slightest bi=
t=20
of feedback.

   Georg

=2D-=20
Georg Wittenburg
http://page.mi.fu-berlin.de/~wittenbu/



=2D-- update-grub.orig	2005-05-31 20:29:47.000000000 +0200
+++ update-grub	2005-05-31 20:33:11.000000000 +0200
@@ -291,6 +291,10 @@
 # should grub lock the alternative boot options in the menu
 	lockalternative=3D"false"
=20
+# additional options to use with the default boot option, but not with the
+# alternatives
+	defoptions=3D""
+
 # options to use with the alternative boot options
 	altoptions=3D"(recovery mode) single"
=20
@@ -613,6 +617,9 @@
 # Extract the lockalternative value
 lockalternative=3D$(GetMenuOpt "lockalternative" "$lockalternative")
=20
+# Extract the additional default options
+defoptions=3D$(GetMenuOpt "defoptions" "$defoptions")
+
 # Extract the howmany value
 howmany=3D$(GetMenuOpt "howmany" "$howmany")
=20
@@ -657,6 +664,12 @@
 echo "# lockalternative=3D$lockalternative" >> $buffer
 echo >> $buffer
=20
+echo "## additional options to use with the default boot option, but not w=
ith=20
the" >> $buffer
+echo "## alternatives" >> $buffer
+echo "## e.g. defoptions=3Dvga=3D0x305 resume=3D/dev/hda5" >> $buffer
+echo "# defoptions=3D$defoptions" >> $buffer
+echo >> $buffer
+
 echo "## altoption boot targets option" >> $buffer
 echo "## multiple altoptions lines are allowed" >> $buffer
 echo "## e.g. altoptions=3D(extra menu suffix) extra boot options" >> $buf=
fer
@@ -772,7 +785,7 @@
 	currentOpt=3D$(get_kernel_opt $kernelVersion)
=20
 	write_kernel_entry "$kernelVersion" "" "" "$grub_root_device" "$kernel" \
=2D	"$currentOpt" "" "$initrd" "true"
+	"$currentOpt" "$defoptions" "$initrd" "true"
=20
 	# insert the alternative boot options
 	if test ! x"$alternative" =3D x"false" ; then

--nextPart4429951.09OHlJMrML
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQBCnK/oSnxlDbf49fMRAnfmAKDweesJ/cKr/RyGelF6EyZIHD3OFQCggPSb
IEsdE0gv48KSSK+DmN0yWfM=
=U45V
-----END PGP SIGNATURE-----

--nextPart4429951.09OHlJMrML--