diff --git a/chroot-script b/chroot-script index ea194d0..6f99e7e 100755 --- a/chroot-script +++ b/chroot-script @@ -523,12 +523,7 @@ EOF # generate /etc/fstab {{{ fstab() { - # set up /etc/fstab if file is not present (cdebootstrap) - if [ ! -f /etc/fstab ] ; then - createfstab - fi - - # set up /etc/fstab if file is UNCONFIGURED (debootstrap) + # set up /etc/fstab if file is UNCONFIGURED (debootstrap, mmdebstrap) if grep -q UNCONFIGURED /etc/fstab ; then createfstab fi diff --git a/config b/config index c825170..7a97f39 100644 --- a/config +++ b/config @@ -100,7 +100,7 @@ # ROOTPASSWORD='' # Name of debootstrap executable. -# Supported values: 'debootstrap', 'cdebootstrap', 'mmdebstrap' +# Supported values: 'debootstrap', 'mmdebstrap' # Default: 'mmdebstrap' # DEBOOTSTRAP='mmdebstrap' diff --git a/debian/control b/debian/control index d71e392..586de4a 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Architecture: all Depends: bash (>= 4.3-11+deb8u2), debian-archive-keyring, - mmdebstrap | debootstrap (>= 1.0.65) | cdebootstrap (>= 0.3.16), + mmdebstrap | debootstrap (>= 1.0.65), dosfstools, e2fsprogs, fdisk | util-linux (<< 2.29.2-3~), @@ -39,7 +39,7 @@ Recommends: parted, qemu-utils, Description: wrapper around debootstrap for installing pure Debian - Provides a wrapper suite around debootstrap, cdebootstrap, mmdebstrap + Provides a wrapper suite around mmdebstrap or debootstrap to ease installation of a pure Debian system. . Configuration can be done on the command line, in a dialog frontend diff --git a/grml-debootstrap b/grml-debootstrap index ed351f9..6c09fbd 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -1873,7 +1873,7 @@ preparechroot() { cp ${VERBOSE:+-v} -a -L "${CONFFILES}"/extrapackages/ "${MNTPOINT}"/etc/debootstrap/ - # make sure we can access network [relevant for cdebootstrap/mmdebstrap] + # make sure we can access network [relevant for mmdebstrap] [ -f "${MNTPOINT}"/etc/resolv.conf ] || cp ${VERBOSE:+-v} /etc/resolv.conf "${MNTPOINT}"/etc/resolv.conf # setup default locales diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt index c9e43b1..e55b51d 100644 --- a/grml-debootstrap.8.txt +++ b/grml-debootstrap.8.txt @@ -14,8 +14,8 @@ image:images/screenshot.png[Screenshot] Introduction ------------ -grml-debootstrap is a wrapper suite around mmdebstrap (and debootstrap and -cdebootstrap) for installing a plain Debian system very fast and easy. +grml-debootstrap is a wrapper suite around mmdebstrap (and debootstrap) +for installing a plain Debian system very fast and easy. All you have to do is adjust a few variables in the configuration file /etc/debootstrap/config or specify some command line options and invoke @@ -430,7 +430,7 @@ Please report bugs towards https://github.com/grml/grml-debootstrap/issues See also -------- -debootstrap (8), cdebootstrap (1), mmdebstrap(1). +debootstrap (8), mmdebstrap(1). Author ------