X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=fc12e7c583507fcb18c601dd2edd0c3d041c7955;hp=0068542da90dd14f19bfef69773cfb35bf3a9dae;hb=a75f067a4f3967a8638a4f5f501adcdcbae88265;hpb=4f9ea9128412213f405416da7f15c3f329857f12

diff --git a/grml-debootstrap b/grml-debootstrap
index 0068542..fc12e7c 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -19,6 +19,7 @@ CONFFILES='/etc/debootstrap'
 DEBCONF='yes'
 DEBIAN_FRONTEND='noninteractive'
 DEBOOTSTRAP='debootstrap'
+DEFAULT_LOCALES='en_US.UTF-8'
 EXTRAPACKAGES='yes'
 FALLBACK_MIRROR='http://http.debian.net/debian'
 FORCE=''
@@ -449,7 +450,7 @@ prompt_for_bootmanager()
   fi
 
   for device in cciss/c0d0 sda hda; do
-    if [ /dev/$device != ${MBRDISK} ]; then
+    if [ "/dev/$device" != "${MBRDISK}" ]; then
       grep -q $device /proc/partitions && \
       ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS:$device:install bootmanager grub into MBR of /dev/$device"
     fi
@@ -470,12 +471,7 @@ prompt_for_bootmanager()
     mbr)
       # /dev/md0: has to be installed in MBR of /dev/md0 and not in /dev/md:
       if echo "$TARGET" | grep -q "/dev/md" ; then
-         # using sw-raid:
-         if [ -n "$SELECTED_PARTITIONS" ] ; then
-            GRUB=$(echo ${SELECTED_PARTITIONS} | awk '{print $1}') # use first disk only
-         else
-            GRUB="$TARGET"
-         fi
+        GRUB="$TARGET"
       else
         GRUB="$MBRDISK"
       fi
@@ -1100,6 +1096,7 @@ preparechroot() {
   [ -n "$DEBCONF" ]             && echo "DEBCONF=\"$DEBCONF\""                         >> $CHROOT_VARIABLES
   [ -n "$DEBIAN_FRONTEND" ]     && echo "DEBIAN_FRONTEND=\"$DEBIAN_FRONTEND\""         >> $CHROOT_VARIABLES
   [ -n "$DEBOOTSTRAP" ]         && echo "DEBOOTSTRAP=\"$DEBOOTSTRAP\""                 >> $CHROOT_VARIABLES
+  [ -n "$DEFAULT_LOCALES" ]     && echo "DEFAULT_LOCALES=\"$DEFAULT_LOCALES\""         >> $CHROOT_VARIABLES
   [ -n "$EXTRAPACKAGES" ]       && echo "EXTRAPACKAGES=\"$EXTRAPACKAGES\""             >> $CHROOT_VARIABLES
   [ -n "$FALLBACK_MIRROR" ]     && echo "FALLBACK_MIRROR=\"$FALLBACK_MIRROR\""         >> $CHROOT_VARIABLES
   [ -n "$FORCE" ]               && echo "FORCE=\"$FORCE\""                             >> $CHROOT_VARIABLES