From 602bbed7d6bb3a8fd1a20fe68da2a4bd800c93ae Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 1 Dec 2014 17:43:20 +0000 Subject: Fix line lengths to be shorter than 80 columns --- morphlib/exts/kvm.write.help | 7 +++--- morphlib/exts/virtualbox-ssh.write.help | 39 +++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/morphlib/exts/kvm.write.help b/morphlib/exts/kvm.write.help index db2c0d97..26a54d9c 100644 --- a/morphlib/exts/kvm.write.help +++ b/morphlib/exts/kvm.write.help @@ -28,8 +28,8 @@ help: | kilo-, mega-, or gigabytes. For example, `DISK_SIZE=100G` would create a 100 gigabyte disk image. **This parameter is mandatory**. - * RAM_SIZE=X: The amount of RAM that the virtual machine should allocate for - itself from the host. `X` is interpreted in the same was as for + * RAM_SIZE=X: The amount of RAM that the virtual machine should allocate + for itself from the host. `X` is interpreted in the same was as for DISK_SIZE`, and defaults to `1G` * VCPUS=n: the number of virtual CPUs for the VM. Allowed values 1-32. Do @@ -42,5 +42,6 @@ help: | * AUTOSTART=` - boolean. If it is set, the VM will be started when it has been deployed. - (See `morph help deploy` for details of how to pass parameters to write extensions) + (See `morph help deploy` for details of how to pass parameters to write + extensions) diff --git a/morphlib/exts/virtualbox-ssh.write.help b/morphlib/exts/virtualbox-ssh.write.help index ad2a83eb..b4c59553 100644 --- a/morphlib/exts/virtualbox-ssh.write.help +++ b/morphlib/exts/virtualbox-ssh.write.help @@ -26,17 +26,17 @@ help: | which it is being deployed. * DISK_SIZE=X: **(MANDATORY)** the size of the VM's primary virtual hard - disk. `X` should use a suffix of `K`, `M`, or `G` (in upper or lower case) - to indicate kilo-, mega-, or gigabytes. For example, `DISK_SIZE=100G` - would create a 100 gigabyte virtual hard disk. + disk. `X` should use a suffix of `K`, `M`, or `G` (in upper or lower + case) to indicate kilo-, mega-, or gigabytes. For example, + `DISK_SIZE=100G` would create a 100 gigabyte virtual hard disk. - * RAM_SIZE=X: The amount of RAM that the virtual machine should allocate for - itself from the host. `X` is interpreted in the same as for DISK_SIZE`, - and defaults to `1G`. + * RAM_SIZE=X: The amount of RAM that the virtual machine should allocate + for itself from the host. `X` is interpreted in the same as for + DISK_SIZE, and defaults to `1G`. * VCPUS=n: the number of virtual CPUs for the VM. Allowed values 1-32. Do - not use more CPU cores than you have available physically (real cores, no - hyperthreads). + not use more CPU cores than you have available physically (real cores, + no hyperthreads). * INITRAMFS_PATH=path: the location of an initramfs for the bootloader to tell Linux to use, rather than booting the rootfs directly. @@ -45,8 +45,8 @@ help: | it has been deployed. * VAGRANT= - boolean. If it is set, then networking is configured - so that the VM will work with Vagrant. Otherwise networking is configured - to run directly in VirtualBox. + so that the VM will work with Vagrant. Otherwise networking is + configured to run directly in VirtualBox. * HOST_IPADDR= - the IP address of the VM host. @@ -61,9 +61,10 @@ help: | eth0:dhcp eth1:static,address=10.0.0.1,netmask=255.255.0.0 - An example of the NETWORK_CONFIG parameter + An example of the NETWORK_CONFIG parameter (It should be in one line) - `"lo:loopback;eth0:static,address=192.168.100.2,netmask=255.255.255.0;eth1:dhcp,hostname=$(hostname)"` + `"lo:loopback;eth0:static,address=192.168.100.2,netmask=255.255.255.0; + eth1:dhcp,hostname=$(hostname)"` It is useful to configure one interface to use NAT to give the VM access to the outside world and another interface to use the Virtual Box host @@ -73,14 +74,18 @@ help: | interface is configured statically. Note: you must give the host-only adapter interface an address that lies - **on the same network** as the host adapter. So if the host adapter has an - IP of 192.168.100.1 eth0 should have an address such as 192.168.100.42. + **on the same network** as the host adapter. So if the host adapter has + an IP of 192.168.100.1 eth0 should have an address such as + 192.168.100.42. The settings of the host adapter, including its IP can be changed either - in the VirtualBox manager UI (https://www.virtualbox.org/manual/ch03.html#settings-network) - or via the VBoxManage command line (https://www.virtualbox.org/manual/ch08.html#idp57572192) + in the VirtualBox manager UI + (https://www.virtualbox.org/manual/ch03.html#settings-network) + or via the VBoxManage command line + (https://www.virtualbox.org/manual/ch08.html#idp57572192) See Chapter 6 of the VirtualBox User Manual for more information about virtual networking (https://www.virtualbox.org/manual/ch06.html) - (See `morph help deploy` for details of how to pass parameters to write extensions) + (See `morph help deploy` for details of how to pass parameters to write + extensions) -- cgit v1.2.1