From: Dinko Korunic <kreator@carnet.hr>
Date: Tue, 26 May 2009 13:55:13 +0000 (+0200)
Subject: - micanje grub-related apsolutnih staza, s obzirom da grub functions.sh napravi potre... 
X-Git-Tag: debian/2.6.26-4~16
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;ds=inline;h=3404916f2b3bab88e5d8bcd8ef0a339f6d980e85;p=kernel-cn.git

- micanje grub-related apsolutnih staza, s obzirom da grub functions.sh napravi potrebnu detekciju
- u slucaju da je detektirani install-device symlink i ako je moguce resolvati symlink.. onda modificiraj device map i unesi za hd0 odgovarajuci resolvani block device
---

diff --git a/debian/postinst b/debian/postinst
index 9fcb548..45f8046 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -107,22 +107,22 @@ fi
 echo -n " kernel-img.conf"
 
 # generate initial grub loaders
-if [ ! -d /boot/grub ]; then
-    mkdir -p /boot/grub
+if [ ! -d "$grub_dir" ]; then
+    mkdir -p "$grub_dir"
     if [ -d /usr/lib/grub/i386-pc ]; then
-        cp -a /usr/lib/grub/i386-pc/* /boot/grub
+        cp -a /usr/lib/grub/i386-pc/* "$grub_dir"
     fi
 fi
 echo -n " grub1"
 
 # create/update grub configuration
-if [ -e /boot/grub/menu.lst ]; then
+if [ -e "$menu_file" ]; then
     # is there uncompatibile grub conf present?
-    if ! grep -q 'AUTOMAGIC KERNELS LIST' /boot/grub/menu.lst; then
-        mv -f /boot/grub/menu.lst /boot/grub/menu.lst.old
+    if ! grep -q 'AUTOMAGIC KERNELS LIST' "$menu_file"; then
+        mv -f "$menu_file" "$menu_file.old"
     fi
 fi
-if [ ! -e /boot/grub/menu.lst ]; then
+if [ ! -e "$menu_file" ]; then
     yes | /usr/sbin/update-grub >/dev/null 2>&1 || true
 else
     /usr/sbin/update-grub >/dev/null 2>&1 || true
@@ -157,24 +157,23 @@ udevcontrol reload_rules >/dev/null 2>&1 || true
 echo -n " udev"
 
 # update device map if possible
-device_map=/boot/grub/device.map
-if [ -f $device_map ]; then
-    mv -f $device_map $device_map.old
+if [ -f "$device_map" ]; then
+    mv -f "$device_map" "$device_map.old"
 fi
-grub --batch --no-floppy --device-map=$device_map <<EOF >/dev/null 2>&1
+grub --batch --no-floppy --device-map="$device_map" <<EOF >/dev/null 2>&1
 quit
 EOF
-if [ ! -s $device_map ]; then
-    if [ -f $device_map.old ]; then
-        mv -f $device_map.old $device_map
+if [ ! -s "$device_map" ]; then
+    if [ -f "$device_map.old" ]; then
+        mv -f "$device_map.old" "$device_map"
     fi
 else
-    rm -f $device_map.old
+    rm -f "$device_map.old"
 fi
 echo -n " grub4"
 
-# install GRUB loader
-install_device=$(grep '^(hd0)' $device_map | \
+# 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 "."
@@ -182,23 +181,40 @@ if [ -z "$install_device" ]; then
     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"
+    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
+echo -n " grub5"
+
+# install GRUB loader
 if ! grub-install --no-floppy "$install_device" >/dev/null 2>&1; then
     echo "."
     echo "CN: FATAL ERROR while running grub-install!"
     echo "CN: Do not reboot your server and report this to OTRS immediately!"
     exit 1
 fi
-echo -n " grub5"
+echo -n " grub6"
 
 # fix possible wrong params in menu.lst
 cp_check_and_sed '^# groot=' \
   "s;^# groot=.*;# groot=$grub_root_device;g" \
-      /boot/grub/menu.lst || true
+      "$menu_file" || true
 cp_check_and_sed '^# kopt=' \
   "s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
-      /boot/grub/menu.lst || true
+      "$menu_file" || true
 /usr/sbin/update-grub >/dev/null 2>&1 || true
-echo -n " grub6"
+echo -n " grub7"
 
 # restore execshield state
 if [ ! -z "$SHIELD" ]; then
@@ -227,7 +243,7 @@ if [ -x /usr/share/mdadm/mkconf ]; then
     echo -n " mdadm"
 fi
 
-# update initramfs accordingly
+# update initramfs accordingly (because of mdadm and udev)
 update-initramfs -u -k all >/dev/null 2>&1 || true
 echo -n " initramfs"
 
diff --git a/grub-functions.sh b/grub-functions.sh
index feb2481..e68bb42 100755
--- a/grub-functions.sh
+++ b/grub-functions.sh
@@ -242,6 +242,29 @@ convert_default () {
 	fi
 }
 
+# Usage: resolve_symlink file
+# Find the real file/device that file points at
+resolve_symlink () {
+	tmp_fname=$1
+	# Resolve symlinks
+	while test -L $tmp_fname; do
+		tmp_new_fname=`ls -al $tmp_fname | sed -n 's%.*-> \(.*\)%\1%p'`
+		if test -z "$tmp_new_fname"; then
+			echo "Unrecognized ls output" 2>&1
+			exit 1
+		fi
+
+		# Convert relative symlinks
+		case $tmp_new_fname in
+			/*) tmp_fname="$tmp_new_fname"
+			;;
+			*) tmp_fname="`echo $tmp_fname | sed 's%/[^/]*$%%'`/$tmp_new_fname"
+			;;
+		esac
+	done
+	echo "$tmp_fname"
+}
+
 ## Configuration Options
 # directory's to look for the grub installation and the menu file
 grub_dirs="/boot/grub /boot/boot/grub"