updates for t11 and fsf

[automated-distro-installer] / fai / config / scripts / GRUB_PC / 10-setup

diff --git a/fai/config/scripts/GRUB_PC/10-setup b/fai/config/scripts/GRUB_PC/10-setup
index e26aa2671180c03eccc373cac1c9845eef818688..11535f11f5b2b4df0f6943a552c020523989842d 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/10-setup
+++ b/fai/config/scripts/GRUB_PC/10-setup
@@ -73,14 +73,16 @@ if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then
     mbrdevices=${mbrdevices%, }
 else
   for dev in $BOOT_DEVICE; do
-    mbrdevices=$(get_stable_devname $dev)
+    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
+      mbrdevices+="$dev, "
     fi
-    echo "Installing grub on $dev = $mbrdevices"
-    $ROOTCMD grub-install --no-floppy "$mbrdevices"
+    echo "Installing grub on $dev = $mbrdev"
+    $ROOTCMD grub-install --no-floppy "$mbrdev"
   done
+  # remove trailing ,
+  mbrdevices=${mbrdevices%, }
 fi
 
 echo "grub-pc grub-pc/install_devices multiselect $mbrdevices" | $ROOTCMD debconf-set-selections