X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=b3e2637bd5bd8e7fbd16305184d10650398c02d1;hp=01c7665276225e0e8e2d7cc902522543bee24944;hb=722c93b5b0118ec6a0792473ba9cf11fb2003781;hpb=2353722d53b5e53766e4e90605d31333343b381a diff --git a/grml-debootstrap b/grml-debootstrap index 01c7665..b3e2637 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -105,7 +105,7 @@ fi # cmdline handling {{{ # source external command line parameter-processing script -. $prog_real.clp +. /usr/share/grml-debootstrap/functions/cmdlineopts.clp # == business-logic of command line parameter-processing @@ -119,6 +119,8 @@ fi if ! . "$CONFFILES/config" ; then eerror "Error reading config file $CONFFILES/config" ; eend 1 ; exit 1 fi + # restore the command line parameter value + CONFFILES=$_opt_confdir } # }}} @@ -728,6 +730,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