From b8fb51c5d22a90f277a1edf03ca406105c2a74cb Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 12 Nov 2013 13:29:55 +0100 Subject: [PATCH 1/1] Fix usage of configuration variables --- grml-debootstrap | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/grml-debootstrap b/grml-debootstrap index f3586f9..9c21050 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -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 -- 2.1.4