X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=1ff9d575f9d3adf7dcbf15542f7d5d0e32b50082;hb=2e9baa8f971a089db7c87bb134dbf62ddd03f607;hp=6dfe2d63009f09888e6896de38e3bc10ca40728b;hpb=75ce3eae72d8ab65d8064fd4e1baf1d2e3fb2aae;p=kernel-cn.git

diff --git a/debian/postinst b/debian/postinst
index 6dfe2d6..1ff9d57 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -89,7 +89,7 @@ echo "."
 # detect existing Grub2 installation
 
 GRUB2="no"
-if [ -e /boot/grub/grub.cfg ]; then
+if [ \( -e /boot/grub/grub.cfg \) -o \( -e /boot/grub/core.img \) ]; then
     echo "CN: Detected GRUB2 installation, will try to use it."
     GRUB2="yes"
     if [ -e /boot/grub/menu.lst ]; then
@@ -178,6 +178,7 @@ if [ "x$GRUB2" = "xno" ]; then
     fi
 else
     # Grub2 part
+    touch /boot/grub/grub.cfg
     update-grub >/dev/null 2>&1 || true
 fi
 echo -n " grub2"
@@ -219,6 +220,13 @@ if [ "x$GRUB2" = "xno" ]; then
     if [ -f "$device_map" ]; then
         mv -f "$device_map" "$device_map.old"
     fi
+    # possible situation when upgrading from Grub1 to Grub2
+    if [ ! -x /usr/sbin/grub ]; then
+        echo "."
+        echo "CN: FATAL ERROR while trying to execute GRUB1!"
+        echo "CN: Do not reboot your server and report this to OTRS immediately!"
+        exit 1
+    fi
     grub --batch --no-floppy --device-map="$device_map" <<'EOF' >/dev/null 2>&1
 quit
 EOF
@@ -232,7 +240,8 @@ EOF
     fi
 else
     # Grub2 part
-    grub-mkdevicemap -n
+    grub-mkdevicemap --no-floppy
+    grub-install --no-floppy --grub-setup=/bin/true "$(grub-probe -t drive /boot/grub)" >/dev/null 2>&1
 fi
 echo -n " grub3"
 
@@ -267,7 +276,7 @@ if [ "x$GRUB2" = "xno" ]; then
     fi
 else
     # Grub2 part
-    install_device='(hd0)'
+    install_device="(hd0)"
 fi
 echo -n " grub4"
 
@@ -323,6 +332,20 @@ if [ "x$GRUB2" = "xno" ]; then
 fi
 echo -n " grub7"
 
+# install to other boot sectors if needed (better safe than sorry)
+if [ "x$GRUB2" = "xyes" ]; then
+    # Grub2 part
+    db_get grub-pc/install_devices
+    for i in `echo $RET | sed -e 's/,/ /g'`; do
+        real_device="$(readlink -f "$i")"
+        if [ -e "$real_device" ]; then
+            grub-install --force --no-floppy $real_device \
+                >/dev/null 2>&1 || true
+        fi
+    done
+fi
+echo -n " grub8"
+
 # disable lilo
 if [ -e /etc/lilo.conf ]; then
     mv -f /etc/lilo.conf /etc/lilo.conf.old