Fix usage of configuration variables
authorMichael Prokop <mika@grml.org>
Tue, 12 Nov 2013 12:29:55 +0000 (13:29 +0100)
committerMichael Prokop <mika@grml.org>
Tue, 12 Nov 2013 12:29:55 +0000 (13:29 +0100)
grml-debootstrap

index f3586f9..9c21050 100755 (executable)
@@ -14,32 +14,32 @@ VERSION="${VERSION:-unknown}"
 MNTPOINT="/mnt/debootstrap.$$"
 
 # defaults
-[ -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"
+[ -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