X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-debootstrap;h=f3586f9843711366399aca7b46bac2ba6ea1b5bb;hb=07140ca7ed2e49357107bc5ee59df93835b14289;hp=fc12e7c583507fcb18c601dd2edd0c3d041c7955;hpb=a75f067a4f3967a8638a4f5f501adcdcbae88265;p=grml-debootstrap.git

diff --git a/grml-debootstrap b/grml-debootstrap
index fc12e7c..f3586f9 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
@@ -77,8 +77,8 @@ Bootstrap options:
 
 Options for Virtual Machine deployment:
 
-      --vmfile           Set up a Virtual Machine instead of installing to
-                         a partition or directory, to be combined with --target,
+      --vmfile           Set up a Virtual Machine (raw format) instead of installing
+                         to a partition or directory, to be combined with --target,
                          like: --vmfile --target /mnt/sda1/qemu.img
       --vmsize <size>    Use specified size for size of VM file (default: 2G).
                          Syntax as supported by qemu-img, like: --vmsize 3G