[Pkg-ganeti-devel] [ganeti] 144/165: Make documentation for -H serial_console more explicit

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit 14b9bda2af3acf4371a933d6da05db746b51d987
Author: Lisa Velden <velden at google.com>
Date:   Tue Jul 21 14:34:42 2015 +0200

    Make documentation for -H serial_console more explicit
    
    Mention that apart from enabling the emulation of a serial port in KVM
    "console=ttyS0,<serial_speed>" is appended to the end of kernel_args.
    
    Signed-off-by: Lisa Velden <velden at google.com>
    Reviewed-by: Klaus Aehlig <aehlig at google.com>
---
 man/gnt-instance.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
index e61c31c..4904bf6 100644
--- a/man/gnt-instance.rst
+++ b/man/gnt-instance.rst
@@ -528,7 +528,7 @@ kernel\_args
     Valid for the Xen PVM and KVM hypervisors.
 
     This options specifies extra arguments to the kernel that will be
-    loaded. device. This is always used for Xen PVM, while for KVM it
+    loaded. This is always used for Xen PVM, while for KVM it
     is only used if the ``kernel_path`` option is also specified.
 
     The default setting for this value is simply ``"ro"``, which
@@ -536,6 +536,9 @@ kernel\_args
     setting this to single will cause the instance to start in
     single-user mode.
 
+    Note that the hypervisor setting ``serial_console`` appends
+    ``"console=ttyS0,<serial_speed>"`` to the end of ``kernel_args`` in KVM.
+
 initrd\_path
     Valid for the Xen PVM and KVM hypervisors.
 
@@ -567,6 +570,10 @@ serial\_console
     instance's startup. For such case it's recommended to disable this
     option, which is enabled by default.
 
+    Enabling serial console emulation also appends
+    ``"console=ttyS0,<serial_speed>"`` to the end of ``kernel_args`` in KVM and
+    may infere with previous settings.
+
 serial\_speed
     Valid for the KVM hypervisor.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git