Hi all,
I attach an updated version of the configurable-savedefault patch that
applies cleanly on 0.97-30.
Andreas
--- a/debian/update-grub 2008-02-10 17:37:10.812178408 +0100
+++ b/debian/update-grub 2008-02-10 17:42:24.516192190 +0100
@@ -330,6 +330,9 @@
# should grub create a memtest86 entry
memtest86="true"
+# should grub add "savedefault" to default boot options
+ savedefault="true"
+
# stores the command line arguments
command_line_arguments=$1
@@ -753,6 +756,8 @@
# Extract the updatedefaultentry option
updatedefaultentry=$(GetMenuOpt "updatedefaultentry" "$updatedefaultentry")
+# Extract the savedefault option
+savedefault=$(GetMenuOpt "savedefault" "$savedefault")
# Generate the menu options we want to insert
buffer=$(tempfile)
@@ -848,6 +853,11 @@
echo "# updatedefaultentry=$updatedefaultentry" >> $buffer
echo >> $buffer
+echo "## should update-grub add savedefault to the default options" >> $buffer
+echo "## can be true or false" >> $buffer
+echo "# savedefault=$savedefault" >> $buffer
+echo >> $buffer
+
echo "## ## End Default Options ##" >> $buffer
echo >> $buffer
@@ -983,7 +993,7 @@
else
kernel=/boot/loader
fi
- write_kernel_entry "" "" "" "$grub_root_device" "$kernel" "" "" "" "true"
""
+ write_kernel_entry "" "" "" "$grub_root_device" "$kernel" "" "" ""
"$savedefault" ""
;;
esac
@@ -998,9 +1008,11 @@
title Chainload into GRUB 2
root $grub_root_device
kernel $grub2name
-savedefault
-
EOF
+ if test x"$savedefault" = x"true" ; then
+ echo "savedefault" >> $buffer
+ fi
+ echo >> $buffer
fi
@@ -1037,7 +1049,7 @@
echo "Found Xen hypervisor $hypervisorVersion, kernel:
$kernel" >&2
write_kernel_entry "$kernelVersion" '' ''
"$grub_root_device" \
- "$kernel" "$currentOpt $xenkopt" '' "$initrd" true ''
\
+ "$kernel" "$currentOpt $xenkopt" '' "$initrd"
"$savedefault" '' \
Xen "$hypervisor" "$hypervisorVersion" "$xenhopt"
counter=$(($counter + 1))
fi
@@ -1050,7 +1062,7 @@
echo "Found Xen hypervisor $hypVersion, kernel:
$kernel" >&2
write_kernel_entry "$kernelVersion" '' ''
"$grub_root_device" \
- "$kernel" "$currentOpt $xenkopt" '' "$initrd" true ''
\
+ "$kernel" "$currentOpt $xenkopt" '' "$initrd"
"$savedefault" '' \
Xen "$kernel_dir/$hypervisor" "$hypVersion" "$xenhopt"
counter=$(($counter + 1))
done
@@ -1103,7 +1115,7 @@
[ $counter -eq 1 ] && do_lockold=false
write_kernel_entry "$kernelVersion" "" "" "$grub_root_device" "$kernel"
\
- "$currentOpt $defoptions" "" "$initrd" "true" "$do_lockold"
+ "$currentOpt $defoptions" "" "$initrd" "$savedefault"
"$do_lockold"
# insert the alternative boot options
if test ! x"$alternative" = x"false" ; then
@@ -1115,7 +1127,7 @@
test x"$lockalternative" = x"true" && do_lockold=false
write_kernel_entry "$kernelVersion" "$descr"
"$lockalternative" \
"$grub_root_device" "$kernel" "$currentOpt"
"$suffix" "$initrd" \
- "true" "$do_lockold"
+ "$savedefault" "$do_lockold"
done
fi
