Bug#266101: Updated Patch

[Georg Wittenburg]

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

Dear Grub Maintainers,

below is the patch to fix this bug. Please apply for I'm getting tired of=20
losing graphical boot, the I/O scheduler of my choice and the setting for t=
he=20
correct resume partition each time I update grub.

Thanks a lot! :)
   Georg

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



=2D-- update-grub.orig    2004-12-09 23:57:43.000000000 +0100
+++ update-grub.new     2004-12-10 00:11:06.000000000 +0100
@@ -256,6 +256,10 @@ fi
 # should grub lock the alternative boot options in the menu
        lockalternative=3D"false"

+# 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"

@@ -596,6 +600,9 @@ alternative=3D$(GetMenuOpt "alternative" "
 # Extract the lockalternative value
 lockalternative=3D$(GetMenuOpt "lockalternative" "$lockalternative")

+# Extract the additional default options
+defoptions=3D$(GetMenuOpt "defoptions" "$defoptions")
+
 # Extract the howmany value
 howmany=3D$(GetMenuOpt "howmany" "$howmany")

@@ -640,6 +647,12 @@ echo "##      lockalternative=3Dfalse" >>
 echo "# lockalternative=3D$lockalternative" >> $buffer
 echo >> $buffer

+echo "## additional options to use with the default boot option, but not w=
ith=20
the" >> $buffer
+echo "## alternatives" >> $buffer
+echo "## e.g. defoptions=3Dresume=3D/dev/hda5 vga=3D0x305" >> $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
@@ -755,7 +768,7 @@ for kern in $sortedKernels ; do
        currentOpt=3D$(get_kernel_opt $kernelVersion)

        write_kernel_entry "$kernelVersion" "" "" "$grub_root_device"=20
"$kernel"\
=2D       "$currentOpt" "" "$initrd"
+       "$currentOpt" "$defoptions" "$initrd"

        # insert the alternative boot options
        if test ! x"$alternative" =3D x"false" ; then

--nextPart2615254.tz4UngG8JE
Content-Type: application/pgp-signature

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

iD8DBQBBuOCESnxlDbf49fMRAqw4AKDpiIiPASvjWXpUdUzgetQI6qFfWgCaAsyc
MyxFYRvZtFfLkIDHOpIbKYc=
=tQpa
-----END PGP SIGNATURE-----

--nextPart2615254.tz4UngG8JE--