From: Michael Prokop Date: Thu, 20 Nov 2008 13:38:55 +0000 (+0100) Subject: Merge branch 'master' of ssh://git@git.grml.org/grml-debootstrap X-Git-Tag: v0.23~12 X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=48cacf0ef620f5dc4a75d59e7313e8a9f40f241e;hp=-c Merge branch 'master' of ssh://git@git.grml.org/grml-debootstrap --- 48cacf0ef620f5dc4a75d59e7313e8a9f40f241e diff --combined grml-debootstrap index f1afb19,b3e2637..984aa1a --- a/grml-debootstrap +++ b/grml-debootstrap @@@ -11,6 -11,7 +11,6 @@@ set -e # exit on any erro # variables {{{ PN="$(basename $0)" -prog_real=`readlink -f -- $0` VERSION='0.23' MNTPOINT="/mnt/debootstrap.$$" @@@ -729,6 -730,7 +729,7 @@@ preparechroot() [ -n "$MIRROR" ] && echo "CHROOTMIRROR=$MIRROR" >> $CHROOT_VARIABLES [ -n "$MIRROR" ] && echo "MIRROR=$MIRROR" >> $CHROOT_VARIABLES [ -n "$KEEP_SRC_LIST" ] && echo "KEEP_SRC_LIST=$KEEP_SRC_LIST" >> $CHROOT_VARIABLES + [ -n "$PACKAGES" ] && echo "PACKAGES=$PACKAGES" >> $CHROOT_VARIABLES [ -n "$ROOTPASSWORD" ] && echo "ROOTPASSWORD=$ROOTPASSWORD" >> $CHROOT_VARIABLES [ -n "$TARGET" ] && echo "TARGET=$TARGET" >> $CHROOT_VARIABLES [ -n "$TARGET_UUID" ] && echo "TARGET_UUID=$TARGET_UUID" >> $CHROOT_VARIABLES