X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=8545cb0af359dbc3d670412ea1370bec0d5c7a15;hb=050a532429b04f95f678e8292282b6d644931a3e;hp=7e0d9538645c3740a701fcb6d6d9bad5fb1087fa;hpb=9b2edd524c22426f9e0f3a8a3e870709679ce5c8;p=kernel-cn.git

diff --git a/debian/postinst b/debian/postinst
index 7e0d953..8545cb0 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -89,7 +89,7 @@ echo "."
 # detect existing Grub2 installation
 
 GRUB2="no"
-if [ -e /boot/grub/grub.cfg ];
+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
@@ -172,13 +172,14 @@ if [ "x$GRUB2" = "xno" ]; then
         fi
     fi
     if [ ! -e "$menu_file" ]; then
-        yes | /usr/sbin/update-grub >/dev/null 2>&1 || true
+        yes | update-grub >/dev/null 2>&1 || true
     else
-        /usr/sbin/update-grub >/dev/null 2>&1 || true
+        update-grub >/dev/null 2>&1 || true
     fi
 else
     # Grub2 part
-    /usr/sbin/update-grub >/dev/null 2>&1 || true
+    touch /boot/grub/grub.cfg
+    update-grub >/dev/null 2>&1 || true
 fi
 echo -n " grub2"
 
@@ -210,7 +211,7 @@ rm -f /etc/udev/rules.d/devfs.rules /etc/udev/rules.d/compat.rules \
 #    ln -s ../udev.rules /etc/udev/rules.d/udev.rules
 #fi
 udevadm control --reload_rules >/dev/null 2>&1 || true
-udevsettle || true
+udevadm settle || true
 echo -n " udev"
 
 # update device map if possible
@@ -232,40 +233,43 @@ 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"
 
 # import GRUB helper functions (again, updated device map)
 . /usr/share/kernel-2.6-cn/grub-functions.sh
 
-# get install device (0x80 BIOS device)
-# this will work for both Grub1 and Grub2
-if [ "x$GRUB2" = "xyes" ]; then
-    device_map=/boot/grub/device.map
-fi
-install_device=$(grep '^(hd0)' "$device_map" | \
-    sed -e 's%[^[:space:]]*[[:space:]]*\([^[:space:]]*\)%\1%')
-if [ -z "$install_device" ]; then
-    echo "."
-    echo "CN: FATAL ERROR while detecting boot disk!"
-    echo "CN: Do not reboot your server and report this to OTRS immediately!"
-    exit 1
-fi
-
-# oops, install device is a symlink...
-if [ -h "$install_device" ]; then
-    install_device_resolved=$(resolve_symlink "$install_device")
-    if [ -z "$install_device_resolved" ]; then
-        install_device_resolved="$install_device"
+if [ "x$GRUB2" = "xno" ]; then
+    # Grub1 part
+    # get install device (0x80 BIOS device)
+    install_device=$(grep '^(hd0)' "$device_map" | \
+        sed -e 's%[^[:space:]]*[[:space:]]*\([^[:space:]]*\)%\1%')
+    if [ -z "$install_device" ]; then
+        echo "."
+        echo "CN: FATAL ERROR while detecting boot disk!"
+        echo "CN: Do not reboot your server and report this to OTRS immediately!"
+        exit 1
     fi
 
-    # try to fix device map with symlink resolved device
-    if [ "x$install_device_resolved" != "x$install_device" ]; then
-        cp_check_and_sed '^\(hd0\)' \
-            "s;^(hd0).*;(hd0)	$install_device_resolved;" "$device_map" \
-            || true
+    # oops, install device is a symlink...
+    if [ -h "$install_device" ]; then
+        install_device_resolved=$(resolve_symlink "$install_device")
+        if [ -z "$install_device_resolved" ]; then
+            install_device_resolved="$install_device"
+        fi
+
+        # try to fix device map with symlink resolved device
+        if [ "x$install_device_resolved" != "x$install_device" ]; then
+            cp_check_and_sed '^\(hd0\)' \
+                "s;^(hd0).*;(hd0)	$install_device_resolved;" "$device_map" \
+                || true
+        fi
     fi
+else
+    # Grub2 part
+    install_device="$(grub-probe -t drive /boot/grub)"
 fi
 echo -n " grub4"
 
@@ -273,7 +277,7 @@ echo -n " grub4"
 # this will work for both Grub1 and Grub2
 if ! grub-install --no-floppy "$install_device" >/dev/null 2>&1; then
     echo "."
-    echo "CN: FATAL ERROR while running grub-install!"
+    echo "CN: FATAL ERROR while running grub-install on $install_device!"
     echo "CN: Do not reboot your server and report this to OTRS immediately!"
     exit 1
 fi
@@ -289,7 +293,7 @@ if [ "x$GRUB2" = "xno" ]; then
       "s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
           "$menu_file" || true
 fi
-/usr/sbin/update-grub >/dev/null 2>&1 || true
+update-grub >/dev/null 2>&1 || true
 echo -n " grub6"
 
 # fix possible wrong params in menu.lst
@@ -380,7 +384,7 @@ rm -f /etc/sysctl.conf.$$
 
 # old kernel params (skipping some of the obsolete or overrided entries)
 if [ -e /etc/sysctl.conf ]; then
-    egrep -v 'net\.core\.(r|w)mem_max|net\.ipv4\.tcp_(r|w)mem|vm\.bdflush|net\.ipv4\.ip_local_port_range|kernel\.rtsig-max|net\.ipv4\.tcp_syncookies|kernel\.exec-shield|net\.ipv4\.tcp_max_syn_backlog|net\.ipv4\.tcp_congestion_control|kernel\.exec-shield' \
+    egrep -v 'net\.core\.(r|w)mem_max|net\.ipv4\.tcp_(r|w)mem|vm\.bdflush|net\.ipv4\.ip_local_port_range|kernel\.rtsig-max|net\.ipv4\.tcp_syncookies|kernel\.exec-shield|net\.ipv4\.tcp_max_syn_backlog|net\.ipv4\.tcp_congestion_control|kernel\.exec-shield|kernel\.maps_protect' \
         /etc/sysctl.conf >> /etc/sysctl.conf.$$
 fi
 
@@ -388,6 +392,13 @@ fi
 cp_mv /etc/sysctl.conf.$$ /etc/sysctl.conf
 echo -n " sysctl.conf"
 
+# reload sysctl ASAP
+if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+  invoke-rc.d procps restart >/dev/null 2>&1 || true
+else
+  /etc/init.d/procps restart >/dev/null 2>&1 || true
+fi
+
 # finished with basic kernel-2.6-cn stuff
 echo "."