X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F10-setup;h=11535f11f5b2b4df0f6943a552c020523989842d;hb=137ffae7de84a51c4b438ccf2fb50f5571f522a6;hp=160dfa2e35fd05333a5b98a895b90e826818aa72;hpb=7f77555b3d92709034fe41919358053c650c71e1;p=automated-distro-installer

diff --git a/fai/config/scripts/GRUB_PC/10-setup b/fai/config/scripts/GRUB_PC/10-setup
index 160dfa2..11535f1 100755
--- a/fai/config/scripts/GRUB_PC/10-setup
+++ b/fai/config/scripts/GRUB_PC/10-setup
@@ -3,6 +3,7 @@
 
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
+set -x
 set -a
 
 # do not set up grub during dirinstall
@@ -16,7 +17,7 @@ if [ -z "$BOOT_DEVICE" ]; then
     exit 189
 fi
 
-# disable os-prober because of #788062
+# disable os-prober because of #802717
 ainsl /etc/default/grub 'GRUB_DISABLE_OS_PROBER=true'
 
 # skip the rest, if not an initial installation
@@ -25,38 +26,65 @@ if [ $FAI_ACTION != "install" ]; then
     exit $error
 fi
 
-$ROOTCMD grub-mkdevicemap --no-floppy
+get_stable_devname() {
 
+    local _DEV="$1"
+    local i
+    declare -a _RES
+
+    # prefer SCSI over ATA over WWN over path
+    # do not use by-path
+
+    for i in $($ROOTCMD udevadm info -r --query=symlink "$_DEV"); do
+        if [[ "$i" =~ /by-id/scsi ]]; then
+            _RES[10]="$i"
+        elif [[ "$i" =~ /by-id/ata ]]; then
+            _RES[20]="$i"
+        elif [[ "$i" =~ /by-id/wwn ]]; then
+            _RES[99]="$i"
+        fi
+    done
+
+    echo "${_RES[@]::1}"
+}
+
+# handle /boot in lvm-on-md
+_bdev=$(readlink -f $BOOT_DEVICE)
+if [ "${_bdev%%-*}" = "/dev/dm" ]; then
+  BOOT_DEVICE=$( lvs --noheadings -o devices $BOOT_DEVICE | sed -e 's/^*\([^(]*\)(.*$/\1/' )
+fi
 
 # Check if RAID is used for the boot device
 if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then
     GROOT=$($ROOTCMD grub-probe -tdrive -d $BOOT_DEVICE)
     raiddev=${BOOT_DEVICE#/dev/}
     # install grub on all members of RAID
-    for device in `LC_ALL=C perl -ne 'if(/^'$raiddev'\s.+raid\d+\s(.+)/){ $_=$1; s/\d+\[\d+\]//g; print }' /proc/mdstat`; do
-	echo Install grub on /dev/$device
+    for device in $(LC_ALL=C perl -ne 'if(/^'$raiddev'\s.+raid\d+\s(.+)/){ $_=$1; s/\d+\[\d+\]//g; s/(nvme.+?)p/$1/g; print }' /proc/mdstat); do
+	pdevice=$(get_stable_devname /dev/$device)
+	if [ -z "$pdevice" ]; then
+	    # if we cannot find a persistent name (for e.g. in a VM) use old name
+	    pdevice="/dev/$device"
+	fi
+	mbrdevices+="$pdevice, "
+	echo Installing grub on /dev/$device = $pdevice
 	$ROOTCMD grub-install --no-floppy "/dev/$device"
     done
-
-elif [[ $GROOT =~ 'hostdisk' ]]; then
-    cat > $target/boot/grub/device.map <<EOF
-(hd0)   $BOOT_DEVICE
-EOF
-    $ROOTCMD grub-install --no-floppy --modules=part_msdos $BOOT_DEVICE
-    if [ $? -eq 0 ]; then
-        echo "Grub installed on hostdisk $BOOT_DEVICE"
-    fi
-    rm $target/boot/grub/device.map
-
+    # remove last ,
+    mbrdevices=${mbrdevices%, }
 else
-    for dev in $BOOT_DEVICE; do
-        GROOT=$($ROOTCMD grub-probe -tdrive -d $dev)
-        $ROOTCMD grub-install --no-floppy "$GROOT"
-        if [ $? -eq 0 ]; then
-            echo "Grub installed on $dev = $GROOT"
-        fi
-    done
+  for dev in $BOOT_DEVICE; do
+    mbrdev=$(get_stable_devname $dev)
+    if [ -z "$mbrdevices" ]; then
+      # if we cannot find a persistent name (for e.g. in a VM) use old name
+      mbrdevices+="$dev, "
+    fi
+    echo "Installing grub on $dev = $mbrdev"
+    $ROOTCMD grub-install --no-floppy "$mbrdev"
+  done
+  # remove trailing ,
+  mbrdevices=${mbrdevices%, }
 fi
-$ROOTCMD update-grub
 
+echo "grub-pc grub-pc/install_devices multiselect $mbrdevices" | $ROOTCMD debconf-set-selections
+$ROOTCMD dpkg-reconfigure grub-pc
 exit $error