X-Git-Url: https://git.siccegge.de//index.cgi?p=forks%2Fvmdebootstrap.git;a=blobdiff_plain;f=vmdebootstrap.8.in;h=56afc3c2fe0ca27f7489704f5dd4e8d2e0ac4558;hp=29e0f6861532a218e74fe611f879c30b15d3ae08;hb=HEAD;hpb=c8fd9ca4ba4e8877bc5d073c4b238e7f0af299b0

diff --git a/vmdebootstrap.8.in b/vmdebootstrap.8.in
index 29e0f68..56afc3c 100644
--- a/vmdebootstrap.8.in
+++ b/vmdebootstrap.8.in
@@ -30,6 +30,7 @@ vmdebootstrap \- install basic Debian system into virtual disk image
 [\-\-bootsize=BOOTSIZE] [\-\-boottype=FSTYPE] [\-\-roottype=FSTYPE] [\-\-foreign=PATH]
 [\-\-variant=VARIANT] [\-\-no-extlinux] [\-\-squash] [\-\-configure-apt]
 [\-\-grub] [\-\-apt-mirror] [\-\-pkglist] [\-\-use\-efi] [\-\-efi\-size]
+[\-\-debootstrapopts]
 .SH DESCRIPTION
 .B vmdebootstrap
 installs a basic Debian system into a virtual disk image,
@@ -84,6 +85,12 @@ into /etc/network/interfaces.d/setup:
  auto eth0
  iface eth0 inet dhcp
 
+For systems running newer versions of systemd, the interface name needs
+to be set in advance of the first boot instead of being dependent on the
+boot itself. See the http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/
+.B vmdebootstrap
+disables this behaviour by symlinking /dev/null to /etc/udev/rules.d/80-net-setup-link.rules
+
 .SH BOOTLOADERS
 Unless the \-\-no\-extlinux or \-\-grub options are specified, the
 image will use
@@ -280,6 +287,11 @@ available.
 Disable extlinux installation and configure grub2 instead. grub2 will be added to
 the list of packages to install. update-grub will be called once the debootstrap is
 complete and grub-install will be called in the image.
+.IP \-\-debootstrapopts
+Pass additional options to debootstrap as a quoted list of options
+and values, separated by spaces.
+e.g. --debootstrapopts="variant=buildd no-check-gpg components=main,contrib".
+See debootstrap \-\-help and debootstrap (1) for valid options.
 .IP \-\-no\-acpid
 Disable installation of acpid if not required, otherwise acpid will be
 installed if \-\-foreign is not used.
@@ -314,14 +326,13 @@ none, simple, meliae, or heapy (default: simple)
 make memory profiling dumps at least SECONDS apart
 .SH EXAMPLE
 To create an image for the stable release of Debian:
-.nf
 .IP
 sudo vmdebootstrap \-\-image test.img \-\-size 1g \\
     \-\-log test.log \-\-log-level debug \-\-verbose \\
     \-\-mirror http://mirror.lan/debian/
 .PP
-To run the test image, make sure it is writeable. Use the \-\-owner
-option to set mode 0644 for the specified user or use chmod manually:
+To run the test image, make sure it is writeable. Use the \-\-owner option to set
+mode 0644 for the specified user or use chmod manually:
 .IP
 sudo chmod a+w ./test.img
 .PP
@@ -329,7 +340,20 @@ Execute using qemu, e.g. on amd64 using qemu-system-x86_64:
 .IP
 qemu-system-x86_64 -drive format=raw,file=./test.img
 .PP
-(This loads the image in a new window.)
+(This loads the image in a new window.) Note the use of -drive
+file=<img>,format=raw which is needed for newer versions of QEMU.
+.PP
+There is EFI firmware available to use with QEMU when testing images built
+using the UEFI support, but this software is in Debian non-free due to patent
+concerns. If you choose to install
+.B
+ovmf
+to test UEFI builds, a secondary change is also needed to symlink the provided
+OVMF.fd to the file required by QEMU: bios-256k.bin and then tell QEMU about
+the location of this file with the -L option:
+.IP
+$ qemu-system-x86_64 \-L /usr/share/ovmf/ -machine accel=kvm \\
+  \-m 4096 \-smp 2 \-drive format=raw,file=test.img
 .PP
 For further examples, including u-boot support for beaglebone-black,
 see /usr/share/vmdebootstrap/examples