From 3a8e642768096085fd6c88a043569e064731b094 Mon Sep 17 00:00:00 2001 From: Darshaka Pathirana Date: Wed, 25 Jul 2018 11:21:30 +0200 Subject: [PATCH] Update documenatation and output for networking options --- grml-debootstrap | 5 ++--- grml-debootstrap.8.txt | 7 +++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/grml-debootstrap b/grml-debootstrap index 5acd60d5..cd57ae07 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -143,8 +143,7 @@ Configuration options: /etc/debootstrap/packages --nokernel Skip installation of default kernel images. --nointerfaces Skip installation of default network configuration. - --defaultinterfaces Install a default /etc/systemd/network/80-dhcp.network file - (enabling DHCP for all network devices). (default) + --defaultinterfaces Install default network configuration. (default) --debconf Pre-seed packages using specified pre-seed db file. --grmlrepos Enable Grml's Debian repository (deb.grml.org). --backportrepos Enable Debian's backports repository (backports.debian.org). @@ -1762,7 +1761,7 @@ iface ${interface} inet dhcp fi if [ -n "$NOINTERFACES" ] ; then - einfo "Not installing /etc/systemd/network/80-dhcp.network as requested via --nointerfaces option" + einfo "Not installing default network configuration as requested via --nointerfaces option" eend 0 elif [ -n "$USE_DEFAULT_INTERFACES" ] ; then einfo "Installing default /etc/network/interfaces as requested via --defaultinterfaces options." diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt index 5f909bc3..3053eae5 100644 --- a/grml-debootstrap.8.txt +++ b/grml-debootstrap.8.txt @@ -155,9 +155,12 @@ Options and environment variables Skip debootstrap, only do configuration to the target. + *--nointerfaces*:: - Do not copy /etc/network/interfaces from host system to the target. + Skip installation of a default network configuration. + Does not provide a default /etc/systemd/network/80-dhcp.network and + /etc/network/interfaces on the target system. *--nokernel*:: @@ -255,7 +258,7 @@ Options and environment variables Set up a Virtual Machine using a regular file instead of installing to a partition/block device or directory. This allows deployment of a Virtual - Machine. The options needs to be combined with the --target option + Machine. ('qemu-img create -f raw ...' is executed on the specified target). This option automatically enables the --defaultinterfaces option. Usage example: --vmfile --target /mnt/sda1/qemu.img