Bug#371196: grub problems with memtest86+, patch

[Matt Taggart]

Hi,

I am also seeing the problem reported in #371196 with update-grub not working 
if memtest86 is true. The submitter is right in that a couple calls to 
write_kernel_entry are missing a parameter. It looks like when the "lockold" 
functionality was introduced not all of them got updated. I'm assuming that 
the memtest86 and  kfreebsd cases don't need the lock functionality? Here's a 
patch based on that. If they do need the lock functionality then you'll need 
additional stuff to check $lockold and the counter stuff, like the main 
kernels do.

-- 
Matt Taggart
taggart at debian.org

-------------- next part --------------
--- /sbin/update-grub~	2006-06-05 08:25:31.000000000 -0700
+++ /sbin/update-grub	2006-06-14 19:02:30.000000000 -0700
@@ -884,7 +884,7 @@
     else
       kernel=/boot/loader
     fi
-    write_kernel_entry "" "" "" "$grub_root_device" "$kernel" "" "" "" "true"
+    write_kernel_entry "" "" "" "$grub_root_device" "$kernel" "" "" "" "true" ""
   ;;
 esac
 
@@ -967,7 +967,7 @@
 			echo "Found kernel: $kernel" >&2
 
 			write_kernel_entry "$kernelVersion" "" "" "$grub_root_device" \
-			"$kernel" "$currentOpt" "" "$initrd" "false"
+			"$kernel" "$currentOpt" "" "$initrd" "false" ""
 		fi
 	done
 fi