Run grub-install using --no-floppy, as requested by gebi

diff --git a/debian/changelog b/debian/changelog
index 2d4be92..29eff40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,9 @@ grml-debootstrap (0.18) unstable; urgency=low
   * Allow use of comments in file /etc/debootstrap/packages.
   * Replace initrd-tools with initramfs-tools.
   * Run aptitude with --without-recommends option.
   * Allow use of comments in file /etc/debootstrap/packages.
   * Replace initrd-tools with initramfs-tools.
   * Run aptitude with --without-recommends option.

+  * Run grub-install using --no-floppy, as requested by gebi.

 
 

- -- Michael Prokop <mika@grml.org>  Thu, 28 Aug 2008 17:11:55 +0200
+ -- Michael Prokop <mika@grml.org>  Thu, 28 Aug 2008 19:35:48 +0200

 
 grml-debootstrap (0.17) unstable; urgency=low
 
 
 grml-debootstrap (0.17) unstable; urgency=low
 

diff --git a/grml-debootstrap b/grml-debootstrap
index e6bfe74..5f2744d 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -739,13 +739,13 @@ grub_install() {
      for device in $SELECTED_PARTITIONS ; do
         GRUB=$(grubdevice $device)
         einfo "Installing grub on ${GRUB}:"
      for device in $SELECTED_PARTITIONS ; do
         GRUB=$(grubdevice $device)
         einfo "Installing grub on ${GRUB}:"

-        [ -x /usr/sbin/grub-install ] && GRUBINSTALL=/usr/sbin/grub-install || GRUBINSTALL=/sbin/grub-install
+        [ -x /usr/sbin/grub-install ] && GRUBINSTALL=/usr/sbin/grub-install --no-floppy || GRUBINSTALL=/sbin/grub-install

         $GRUBINSTALL --root-directory="$MNTPOINT" "(${GRUB})"
         eend $?
      done
   else
      einfo "Installing grub on ${GRUB}:"
         $GRUBINSTALL --root-directory="$MNTPOINT" "(${GRUB})"
         eend $?
      done
   else
      einfo "Installing grub on ${GRUB}:"

-     [ -x /usr/sbin/grub-install ] && GRUBINSTALL=/usr/sbin/grub-install || GRUBINSTALL=/sbin/grub-install
+     [ -x /usr/sbin/grub-install ] && GRUBINSTALL=/usr/sbin/grub-install --no-floppy || GRUBINSTALL=/sbin/grub-install

      $GRUBINSTALL --root-directory="$MNTPOINT" "(${GRUB})"
      eend $?
   fi
      $GRUBINSTALL --root-directory="$MNTPOINT" "(${GRUB})"
      eend $?
   fi