X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=093c6137d00652478e26f350a23a9457ad464273;hb=9f007357adc5610f7c392bc6fdb19004b476342e;hp=0312b32d920ce304bcb21481954153a46b6a71aa;hpb=e2e6d1ca096979fbbaf7fcb05de8943358eed0e0;p=kernel-cn.git diff --git a/debian/postinst b/debian/postinst index 0312b32..093c613 100755 --- a/debian/postinst +++ b/debian/postinst @@ -157,7 +157,7 @@ rm -f /etc/udev/rules.d/devfs.rules /etc/udev/rules.d/compat.rules \ #if [ ! -e /etc/udev/rules.d/udev.rules ]; then # ln -s ../udev.rules /etc/udev/rules.d/udev.rules #fi -udevcontrol reload_rules >/dev/null 2>&1 || true +udevadm control --reload_rules >/dev/null 2>&1 || true udevsettle || true echo -n " udev" @@ -173,11 +173,14 @@ if [ ! -s "$device_map" ]; then mv -f "$device_map.old" "$device_map" fi -:q!else +else rm -f "$device_map.old" fi echo -n " grub4" +# import GRUB helper functions (again, updated device map) +. /usr/share/kernel-2.6-cn/grub-functions.sh + # get install device (0x80 BIOS device) install_device=$(grep '^(hd0)' "$device_map" | \ sed -e 's%[^[:space:]]*[[:space:]]*\([^[:space:]]*\)%\1%')