X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=0e31f7095b8f40b64c7f515112cb56e357f4852d;hp=b2839917f92849086c2c87b2bc60ba388c8882fd;hb=00642691771b3adcc1fc6223d8f928c229989434;hpb=831a5d8c6003efcfa5eabaa181a026b795ac68e1

diff --git a/chroot-script b/chroot-script
index b283991..0e31f70 100755
--- a/chroot-script
+++ b/chroot-script
@@ -78,7 +78,7 @@ chrootmirror() {
   fi
 
   if [ -z "$COMPONENTS" ] ; then
-    COMPONENTS='main contrib non-free'
+    COMPONENTS='main'
   fi
   echo "Using repository components $COMPONENTS"
 
@@ -585,11 +585,13 @@ grub_install() {
         echo "Installing grub on ${GRUB}:"
         grub-install --no-floppy "$GRUB"
      done
+     rm -f /boot/grub/device.map
   else
      echo "Installing grub on ${GRUB}:"
      case "$RELEASE" in
        lenny|squeeze|wheezy)
          grub-install --no-floppy "$(readlink -f "${GRUB}")"
+         rm -f /boot/grub/device.map
          ;;
        *)
          echo "(hd0) ${GRUB}" > /boot/grub/device.map