X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=ce9b5d6fd7edc88ae91dcd498854aca4a217a77c;hb=e5c46f37624fbd8c6e7fb400e2f2019af3431c11;hp=a4b757778ac2c97dab98e618306022d37c94cc27;hpb=d19c2c3da15c2b8550146e66031fb51938cd125f;p=kernel-cn.git

diff --git a/debian/postinst b/debian/postinst
index a4b7577..ce9b5d6 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -169,11 +169,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%')
@@ -210,8 +213,6 @@ fi
 echo -n " grub6"
 
 # fix possible wrong params in menu.lst
-root_device=/dev/sda6
-grub_root_device=$(convert_default "$root_device")
 cp_check_and_sed '^# groot=' \
   "s;^# groot=.*;# groot=$grub_root_device;g" \
       "$menu_file" || true