X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=c87c9b6cd5b5436e74d900b6ee83569d1be27b86;hp=a613c9333759379b86f840a3c0e21992ea5c1e46;hb=172555b16331aaa411d3cdac7625e5d0d444d793;hpb=ddf2a40ee91694dc0f8006cfbc9844acd4f36a68

diff --git a/grml-debootstrap b/grml-debootstrap
index a613c93..c87c9b6 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -14,32 +14,32 @@ VERSION="${VERSION:-unknown}"
 MNTPOINT="/mnt/debootstrap.$$"
 
 # defaults
-CHROOT_SCRIPTS='yes'
-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=''
-HOSTNAME='grml'
-INITRD='yes'
-INSTALL_NOTES='/etc/debootstrap/install_notes'
-LOCALES='yes'
-MIRROR="$FALLBACK_MIRROR"
-MKFS='mkfs.ext3'
-PACKAGES='yes'
-PRE_SCRIPTS='yes'
-RECONFIGURE='console-data'
-RELEASE='wheezy'
-RM_APTCACHE='yes'
-SCRIPTS='yes'
-SECURE='yes'
-TIMEZONE='Europe/Vienna'
-TUNE2FS='tune2fs -c0 -i0'
-UPGRADE_SYSTEM='yes'
-VMSIZE="2G"
+[ -n "$CHROOT_SCRIPTS"] || CHROOT_SCRIPTS='yes'
+[ -n "$CONFFILES"] || CONFFILES='/etc/debootstrap'
+[ -n "$DEBCONF"] || DEBCONF='yes'
+[ -n "$DEBIAN_FRONTEND"] || DEBIAN_FRONTEND='noninteractive'
+[ -n "$DEBOOTSTRAP"] || DEBOOTSTRAP='debootstrap'
+[ -n "$DEFAULT_LOCALES"] || DEFAULT_LOCALES='en_US.UTF-8'
+[ -n "$EXTRAPACKAGES"] || EXTRAPACKAGES='yes'
+[ -n "$FALLBACK_MIRROR"] || FALLBACK_MIRROR='http://http.debian.net/debian'
+[ -n "$FORCE"] || FORCE=''
+[ -n "$HOSTNAME"] || HOSTNAME='grml'
+[ -n "$INITRD"] || INITRD='yes'
+[ -n "$INSTALL_NOTES"] || INSTALL_NOTES='/etc/debootstrap/install_notes'
+[ -n "$LOCALES"] || LOCALES='yes'
+[ -n "$MIRROR"] || MIRROR="$FALLBACK_MIRROR"
+[ -n "$MKFS"] || MKFS='mkfs.ext3'
+[ -n "$PACKAGES"] || PACKAGES='yes'
+[ -n "$PRE_SCRIPTS"] || PRE_SCRIPTS='yes'
+[ -n "$RECONFIGURE"] || RECONFIGURE='console-data'
+[ -n "$RELEASE"] || RELEASE='wheezy'
+[ -n "$RM_APTCACHE"] || RM_APTCACHE='yes'
+[ -n "$SCRIPTS"] || SCRIPTS='yes'
+[ -n "$SECURE"] || SECURE='yes'
+[ -n "$TIMEZONE"] || TIMEZONE='Europe/Vienna'
+[ -n "$TUNE2FS"] || TUNE2FS='tune2fs -c0 -i0'
+[ -n "$UPGRADE_SYSTEM"] || UPGRADE_SYSTEM='yes'
+[ -n "$VMSIZE"] || VMSIZE="2G"
 
 # inside the chroot system locales might not be available, so use minimum:
 export LANG=C
@@ -450,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
@@ -471,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