Bug#266101: Updated Patch

[Georg Wittenburg]

Hi!

This is the patch updated to grub 0.95+cvs20040624-16. Please apply!

Regards,
   Georg

-- 
Georg Wittenburg
http://page.mi.fu-berlin.de/~wittenbu/

--- update-grub.orig 2005-04-06 21:39:16.000000000 +0200
+++ update-grub 2005-04-06 21:39:34.000000000 +0200
@@ -291,6 +291,10 @@
 # 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"
 
@@ -637,6 +641,9 @@
 # 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")
 
@@ -681,6 +688,12 @@
 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=vga=0x305 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
@@ -796,7 +809,7 @@
  currentOpt=$(get_kernel_opt $kernelVersion)
 
  write_kernel_entry "$kernelVersion" "" "" "$grub_root_device" "$kernel" \
- "$currentOpt" "" "$initrd" "true"
+ "$currentOpt" "$defoptions" "$initrd" "true"
 
  # insert the alternative boot options
  if test ! x"$alternative" = x"false" ; then