Removed interactions with the /boot/grub/default file.

1 files changed, 4 insertions, 113 deletions

diff --git a/update-menu-lst b/update-menu-lst
index caca686..84dae14 100755
--- a/update-menu-lst
+++ b/update-menu-lst
@@ -184,10 +184,6 @@ convert_default () {
 menu_file_basename=menu.lst
 menu_file=$grub_dir/$menu_file_basename
 
-# Full path to the default file
-default_file_basename=default
-default_file=$grub_dir/$default_file_basename
-
 # the device for the / filesystem
 root_device=$(find_device "/")
 
@@ -220,9 +216,6 @@ kopt="root=$linux_root_device ro"
 # Title
 title="Debian GNU/`uname -s | sed -e s,GNU/,,g`"
 
-# should update-grub remember the default entry
-updatedefaultentry="false"
-
 # Drive(in GRUB terms) where the kernel is located. Overridden by the
 # groot statement in menufile.
 grub_root_device=$(convert_default "$boot_device")
@@ -256,9 +249,6 @@ grub_root_device=$(convert_default "$boot_device")
 # should grub create a memtest86 entry
 	memtest86="true"
 
-# should grub add "savedefault" to default boot options
-	savedefault="false"
-
 # stores the command line arguments
 	command_line_arguments=$1
 
@@ -280,11 +270,6 @@ cat > "$newtemplate" <<EOF
 ## default num
 # Set the default entry to the entry number NUM. Numbering starts from 0, and
 # the entry number 0 is the default if the command is not used.
-#
-# You can specify 'saved' instead of a number. In this case, the default entry
-# is the entry saved with the command 'savedefault'.
-# WARNING: If you are using dmraid do not change this entry to 'saved' or your
-# array will desync and will not let you boot your system.
 default		0
 
 ## timeout sec
@@ -319,18 +304,6 @@ timeout		5
 EOF
 ## End Configuration Options
 
-echo -n "Searching for default file ... " >&2
-if [ -f "$default_file" ] ; then
-  echo "found: $default_file" >&2
-else
-  echo "Generating $default_file file and setting the default boot entry to 0" >&2
-  if [ -f /usr/lib/grub-legacy/grub-set-default ] ; then
-    /usr/lib/grub-legacy/grub-set-default $1
-  else
-    grub-set-default $1
-  fi
-fi
-
 # Make sure we use the standard sorting order
 LC_COLLATE=C
 # Magic markers we use
@@ -490,7 +463,6 @@ write_kernel_entry()
 	local kernel_options; kernel_options=$1; shift
 	local recovery_suffix; recovery_suffix=$1; shift
 	local initrd; initrd=$1; shift
-	local savedefault; savedefault=$1; shift
 	local lockold; lockold=$1; shift
 	local hypervisor
 	if [ -n "$1" ]; then
@@ -554,9 +526,6 @@ write_kernel_entry()
 		echo "$initrd" >> $buffer
 	fi
 
-	if test x"$savedefault" = x"true" ; then
-		echo "savedefault" >> $buffer
-	fi
 	echo >> $buffer
 }
 
@@ -626,13 +595,6 @@ howmany=$(GetMenuOpt "howmany" "$howmany")
 # Extract the memtest86 value
 memtest86=$(GetMenuOpt "memtest86" "$memtest86")
 
- 
-# 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)
 echo $start >> $buffer
@@ -722,16 +684,6 @@ echo "##      memtest86=false" >> $buffer
 echo "# memtest86=$memtest86" >> $buffer
 echo >> $buffer
 
-echo "## should update-grub adjust the value of the default booted system" >> $buffer
-echo "## can be true or false" >> $buffer
-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
 
@@ -819,27 +771,6 @@ for hyp in /boot/xen-*.gz; do
     fi
 done
 
-#Finding the value the default line
-use_grub_set_default="false"
-if test "$updatedefaultentry" = "true" ; then
-	defaultEntryNumber=$(sed -ne 's/^[[:blank:]]*default[[:blank:]]*\(.*\).*/\1/p' $menu)
-
-	if [ "$defaultEntryNumber" = "saved" ] ; then
-	    defaultEntryNumber=$(sed 'q' "$grub_dir/default")
-	    use_grub_set_default="true"	   
-	fi
-	
-	if test -n "$defaultEntryNumber"; then	
-		defaultEntryNumberPlusOne=$(expr $defaultEntryNumber \+ 1);
-		defaultEntry=$(grep "^[[:blank:]]*title" $menu | sed -ne "${defaultEntryNumberPlusOne}p" | sed -ne ";s/^[[:blank:]]*title[[:blank:]]*//p")
-		defaultEntry=$(echo $defaultEntry | sed -e "s/[[:blank:]]*$//") # don't trust trailing blanks	
-	else
-		notChangeDefault="yes"
-	fi
-else
-		notChangeDefault="yes"
-fi
-
 ## heres where we start writing out the kernel entries
 counter=0
 
@@ -901,7 +832,7 @@ for kern in $xen0Kernels ; do
 			echo "Found Xen hypervisor $hypervisorVersion,  kernel: $kernel" >&2
 
 			write_kernel_entry "$kernelVersion" '' '' "$grub_root_device" \
-			  "$kernel" "$currentOpt $xenkopt" '' "$initrd" "$savedefault" '' \
+			  "$kernel" "$currentOpt $xenkopt" '' "$initrd" '' \
 			  Xen "$hypervisor" "$hypervisorVersion" "$xenhopt"
 	        counter=$(($counter + 1))
 		fi
@@ -914,7 +845,7 @@ for kern in $xen0Kernels ; do
 			echo "Found Xen hypervisor $hypVersion,  kernel: $kernel" >&2
 
 			write_kernel_entry "$kernelVersion" '' '' "$grub_root_device" \
-			  "$kernel" "$currentOpt $xenkopt" '' "$initrd" "$savedefault" '' \
+			  "$kernel" "$currentOpt $xenkopt" '' "$initrd" '' \
 			  Xen "$kernel_dir/$hypervisor" "$hypVersion" "$xenhopt"
 	        counter=$(($counter + 1))
 		done
@@ -967,7 +898,7 @@ for kern in $sortedKernels ; do
 	[ $counter -eq 1 ] && do_lockold=false
 
 	write_kernel_entry "$kernelVersion" "" "" "$grub_root_device" "$kernel" \
-		"$currentOpt $defoptions" "" "$initrd" "$savedefault" "$do_lockold"
+		"$currentOpt $defoptions" "" "$initrd" "$do_lockold"
 
 	# insert the alternative boot options
 	if test ! x"$alternative" = x"false" ; then
@@ -979,7 +910,7 @@ for kern in $sortedKernels ; do
 			test x"$lockalternative" = x"true" && do_lockold=false
 			write_kernel_entry "$kernelVersion" "$descr" "$lockalternative" \
 				"$grub_root_device" "$kernel" "$currentOpt" "$suffix" "$initrd" \
-				"$savedefault" "$do_lockold"
+				"$do_lockold"
 
 		done
 	fi
@@ -1021,45 +952,5 @@ else
     rm -f $buffer $menu.new
 fi
 
-# Function to update the default value
-set_default_value() {
-    if [ "$use_grub_set_default" = "true" ] ; then
-	if [ -f /usr/lib/grub-legacy/grub-set-default ] ; then
-	    /usr/lib/grub-legacy/grub-set-default $1
-	else
-	    grub-set-default $1
-	fi
-    else
-	value="$1"
-	newmenu=$(tempfile)
-	sed -e "s/^[[:blank:]]*default[[:blank:]]*[[:digit:]]*\(.*\)/default         ${value}\1/;b" $menu > $newmenu
-	cat $newmenu > $menu
-	rm -f $newmenu
-	unset newmenu
-    fi
-}
-
-#Updating the default number
-if [ "$LET_US_TRY_GRUB_2" = "true" ] && test -f /boot/grub/core.img ; then
-	set_default_value "0"
-elif test -z "$notChangeDefault"; then
-	newDefaultNumberPlusOne=$(grep "^[[:blank:]]*title[[:blank:]]*" $menu | grep -n "${defaultEntry}" | cut -f1 -d ":" | sed -ne "1p")
-	if test -z "$newDefaultNumberPlusOne"; then
-		echo "Previous default entry removed, resetting to 0">&2
-		set_default_value "0"
-	elif test -z "$defaultEntry"; then
-		echo "Value of default value matches no entry, resetting to 0" >&2
-		set_default_value "0"
-	else
-		if test "$newDefaultNumberPlusOne" = "1"; then
-			newDefaultNumber="0"
-		else
-			newDefaultNumber=$(expr $newDefaultNumberPlusOne - 1)
-		fi
-		echo "Updating the default booting kernel">&2
-		set_default_value "$newDefaultNumber"
-	fi
-fi
-
 echo "done" >&2
 echo >&2