From f4b1a6d842465b806c79791ace97283b13e6976b Mon Sep 17 00:00:00 2001 From: Dinko Korunic Date: Thu, 28 Apr 2011 15:01:47 +0200 Subject: [PATCH] - maknuti nepotreban device resolving za grub2 --- debian/postinst | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/debian/postinst b/debian/postinst index 806684d..63cf3b2 100755 --- a/debian/postinst +++ b/debian/postinst @@ -239,33 +239,35 @@ 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='(hd0)' fi echo -n " grub4" -- 1.7.10.4