Skip to content

Commit

Permalink
Update documenatation and output for networking options
Browse files Browse the repository at this point in the history
  • Loading branch information
jkirk committed Jul 25, 2018
1 parent 2acba12 commit 49f7f58
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
5 changes: 2 additions & 3 deletions grml-debootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,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 <file> 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).
Expand Down Expand Up @@ -1696,7 +1695,7 @@ iface eth0 inet dhcp
"

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/systemd/network/80-dhcp.network as requested via --defaultinterfaces options."
Expand Down
17 changes: 10 additions & 7 deletions grml-debootstrap.8.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,10 @@ Options and environment variables

*--defaultinterfaces*::

Install a default /etc/network/interfaces file (enabling DHCP for eth0)
instead of taking over config from host system.
Install default network configuration. (default)
Provides /etc/systemd/network/80-dhcp.network (enabling DHCP for all
ethernet network devices) and /etc/network/interfaces file (enabling DHCP
for eth0).

*--efi* _device_::

Expand Down Expand Up @@ -152,10 +154,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.
This option is automatically enabled when using --vm or --vmfile.
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*::

Expand Down Expand Up @@ -237,15 +241,14 @@ Options and environment variables

Set up a Virtual Machine on an existing block device, which will be
partitioned.
This allows deployment of a Virtual Machine. The options needs to be
combined with the --target option.
This allows deployment of a Virtual Machine.
Usage example: --vm --target /dev/mapper/your-vm-disk

*--vmfile*::

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).
Usage example: --vmfile --target /mnt/sda1/qemu.img

Expand Down

0 comments on commit 49f7f58

Please sign in to comment.