Hi Otavio, 

thanks for your recent work on grub and update-grub. Please consider applying 
the following patch which fixes bug #266101.

Thanks!
   Georg

-- 
Georg Wittenburg
http://page.mi.fu-berlin.de/~wittenbu/
--- update-grub.orig	2005-11-24 09:49:19.000000000 +0100
+++ update-grub	2005-11-24 09:49:24.000000000 +0100
@@ -294,6 +294,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"
 
@@ -624,6 +628,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")
 
@@ -668,6 +675,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=791 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
@@ -793,7 +806,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

Attachment: pgprAgNhLrdwe.pgp
Description: PGP signature

Reply via email to