and again upgrade-from-grub-legacy

diff --git a/debian/changelog b/debian/changelog
index 860252943379da9c5695da77b1c51af03ffafe07..067ae13da2c29e840ad961050bd8c7cf83cd8eca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 grub2 (1.96+20080717-2) experimental; urgency=low
 
-  * upgrade-from-grub-legacy now calls update-grub if there's no
-    grub.cfg
+  * upgrade-from-grub-legacy now calls update-grub if grub.cfg doestn't exist
+    and prints a big warning if it failed.
   
   * Update Standards version to 3.8.0. No changes need.
-  * Added Build-Dep for po-debconf and a lintian overide, to make it happy.
+  * Added Build-Dep for po-debconf and a lintian override, to make it happy.
 
   [ Updated translations ]
   * Swedish (sv.po) by Martin Ågren (Closes: #492056)

diff --git a/debian/legacy/upgrade-from-grub-legacy b/debian/legacy/upgrade-from-grub-legacy
index c697cc18d3a991e087e8a1fe7ba515202126edea..b39e3ebfdf803d18ddde0342bce6daa222815519 100644 (file)
--- a/debian/legacy/upgrade-from-grub-legacy
+++ b/debian/legacy/upgrade-from-grub-legacy
@@ -5,7 +5,14 @@ grub-install "(hd0)"
 
 if test ! -f /boot/grub/grub.cfg ; then
   echo -e "\nCalling update-grub to generate grub.cfg\n" >&2
-  update-grub
+  update-grub || cat << EOF
+Failed to generate /boot/grub/grub.cfg but GRUB2 has been already installed to
+your MBR.
+THIS MEANS YOU HAVE CURRENTLY AN UNBOOTABLE SYSTEM.
+Either fix the error from update-grub and run $0 again
+or install old grub again and run grub-install from it to have again
+grub-legacy in your MBR.
+EOF
 fi
 
 # These never contain any valuable information, and they aren't useful for