- migrate from udevsettle to udevadm settle

[kernel-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 7e0d953..806684d 100755 (executable)
--- 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 ]; then
     echo "CN: Detected GRUB2 installation, will try to use it."
     GRUB2="yes"
     if [ -e /boot/grub/menu.lst ]; then
@@ -172,13 +172,13 @@ 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
+    update-grub >/dev/null 2>&1 || true
 fi
 echo -n " grub2"
 
@@ -210,7 +210,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
@@ -273,7 +273,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 +289,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