On Sat, Apr 22, 2006 at 08:33:38PM +0200, Andreas Barth wrote: > A combination of a working patch in the most current point release, > documentation in the etch release notes and a conflict with the current > package in sarge might however do the trick. Dear grub maintainers Can you please prepare an upload to stable which includes the update-grub fix from 0.97-3? The attached patch is a port of my original patch to the version in sarge. Bastian -- War is never imperative. -- McCoy, "Balance of Terror", stardate 1709.2
diff -u grub-0.95+cvs20040624/debian/changelog grub-0.95+cvs20040624/debian/changelog
--- grub-0.95+cvs20040624/debian/changelog
+++ grub-0.95+cvs20040624/debian/changelog
@@ -1,3 +1,9 @@
+grub (0.95+cvs20040624-17sarge1) stable; urgency=low
+
+ *
+
+ -- Bastian Blank <waldi@debian.org> Fri, 28 Apr 2006 22:41:04 +0200
+
grub (0.95+cvs20040624-17) unstable; urgency=low
* update-grub: fix sort order of new 4 digit kernel versions.
diff -u grub-0.95+cvs20040624/debian/update-grub grub-0.95+cvs20040624/debian/update-grub
--- grub-0.95+cvs20040624/debian/update-grub
+++ grub-0.95+cvs20040624/debian/update-grub
@@ -557,28 +557,28 @@
}
-echo -n "Testing for an existing GRUB menu.list file... "
+echo -n "Testing for an existing GRUB menu.list file... " >&2
# Test if our menu file exists
if [ -f "$menu_file" ] ; then
menu="$menu_file"
rm -f $newtemplate
unset newtemplate
- echo "found: $menu_file ."
+ echo "found: $menu_file ." >&2
cp -f "$menu_file" "$menu_file~"
else
# if not ask user if they want us to create one
menu="$menu_file"
- echo
- echo
- echo -n "Could not find $menu_file file. "
+ echo >&2
+ echo >&2
+ echo -n "Could not find $menu_file file. " >&2
if [ "-y" = "$command_line_arguments" ] ; then
- echo
- echo "Generating $menu_file"
+ echo >&2
+ echo "Generating $menu_file" >&2
answer=y
else
- echo -n "Would you like $menu_file generated for you? "
- echo -n "(y/N) "
+ echo -n "Would you like $menu_file generated for you? " >&2
+ echo -n "(y/N) " >&2
read answer
fi
@@ -687,13 +687,13 @@
echo "## ## End Default Options ##" >> $buffer
echo >> $buffer
-echo -n "Searching for splash image... "
+echo -n "Searching for splash image... " >&2
if [ -f /boot/grub/splash.xpm.gz ]; then
- echo "found: /boot/grub/splash.xpm.gz ."
+ echo "found: /boot/grub/splash.xpm.gz ." >&2
echo "splashimage=${grub_root_device}${grub_dir}/splash.xpm.gz" >> $buffer
echo >> $buffer
else
- echo "none found, skipping..."
+ echo "none found, skipping..." >&2
fi
sortedKernels=""
@@ -747,7 +747,7 @@
initrd=$kernel_dir/$initrdName
fi
- echo "Found kernel: $kernel"
+ echo "Found kernel: $kernel" >&2
if [ "$kernelName" = "vmlinuz" ]; then
if [ -L "/boot/$kernelName" ]; then
@@ -799,7 +799,7 @@
currentOpt=
initrd=
- echo "Found kernel: $kernel"
+ echo "Found kernel: $kernel" >&2
write_kernel_entry "$kernelVersion" "" "" "$grub_root_device" \
"$kernel" "$currentOpt" "" "$initrd" "false"
@@ -809,7 +809,7 @@
echo $end >> $buffer
-echo -n "Updating $menu ... "
+echo -n "Updating $menu ... " >&2
# Insert the new options into the menu
if ! grep -q "^$start" $menu ; then
cat $buffer >> $menu
@@ -827,2 +827,2 @@
-echo "done"
-echo
+echo "done" >&2
+echo >&2
Attachment:
signature.asc
Description: Digital signature