diff options
| author | Sean Bright <sean.bright@gmail.com> | 2016-11-18 17:15:08 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-22 13:27:22 -0500 |
| commit | 7e586f0d4f59a5051f8723e6bbdd06466d19729e (patch) | |
| tree | 3dac3559f8934ff618b157009b171821b1768995 /doc/rtd/topics/boot.rst | |
| parent | edd94ebff613fd99768d9287b12d72a9409ae6bc (diff) | |
| download | vyos-cloud-init-7e586f0d4f59a5051f8723e6bbdd06466d19729e.tar.gz vyos-cloud-init-7e586f0d4f59a5051f8723e6bbdd06466d19729e.zip | |
Doc: various documentation fixes
Several various minor fixes for the readthedocs documentation.
Diffstat (limited to 'doc/rtd/topics/boot.rst')
| -rw-r--r-- | doc/rtd/topics/boot.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/rtd/topics/boot.rst b/doc/rtd/topics/boot.rst index 9d42336c..859409a6 100644 --- a/doc/rtd/topics/boot.rst +++ b/doc/rtd/topics/boot.rst @@ -21,7 +21,7 @@ boot goals. By default, this generator will enable cloud-init. It will not enable cloud-init if either: * A file exists: ``/etc/cloud/cloud-init.disabled`` - * The kernel command line as fond in /proc/cmdline contains ``cloud-init=disabled``. + * The kernel command line as found in /proc/cmdline contains ``cloud-init=disabled``. When running in a container, the kernel command line is not honored, but cloud-init will read an environment variable named ``KERNEL_CMDLINE`` in its place. @@ -56,7 +56,7 @@ is rendered. This includes clearing of all previous (stale) configuration including persistent device naming with old mac addresses. This stage must block network bring-up or any stale configuration might -already have been applied. That could have negative effects such as DCHP +already have been applied. That could have negative effects such as DHCP hooks or broadcast of an old hostname. It would also put the system in an odd state to recover from as it may then have to restart network devices. |