X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-debootstrap;h=99faf51afc2ddd3385d13cbad61e7d2be84d8d0b;hb=df0f07e25b7de55740c79376b65cf962ffb3833f;hp=297628075f54b6fe6c3b9d7994af77a602e83f3b;hpb=72dd31f6584e5375a4a9970254c04838dec1ce72;p=grml-debootstrap.git diff --git a/grml-debootstrap b/grml-debootstrap index 2976280..99faf51 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -694,9 +694,9 @@ debootstrap_system() { mount_target fi if grep -q $MNTPOINT /proc/mounts || [ -n "$DIRECTORY" ] ; then - einfo "Running $DEBOOTSTRAP for release ${RELEASE}${ARCHINFO} using ${MIRROR}${ISO}" - [ -n "$MIRROR" ] && $DEBOOTSTRAP $ARCHCMD $RELEASE $MNTPOINT $MIRROR || \ - $DEBOOTSTRAP $ARCHCMD $RELEASE $MNTPOINT $ISO + einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}${ISO}" + [ -n "$MIRROR" ] && $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR || \ + $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO eend $? else eerror "Error: $MNTPOINT not mounted, can not continue." @@ -739,6 +739,8 @@ preparechroot() { sed -i "s#GROOT=.*#GROOT=\"$GROOT\"#" $MNTPOINT/etc/debootstrap/config cp /etc/debootstrap/packages $MNTPOINT/etc/debootstrap/packages + [ -f /etc/debootstrap/debconf-selections -a "$DEBCONF" = 'yes' ] && \ + cp /etc/debootstrap/debconf-selections $MNTPOINT/etc/debootstrap/ # notice: do NOT use $CHROOT_VARIABLES inside chroot but statically file instead! cp $CHROOT_VARIABLES $MNTPOINT/etc/debootstrap/variables