Merge lp:~smoser/maas/drop-ttyS0-kernel-opt into lp:~maas-committers/maas/trunk

[Scott Moser]

on intel, do not send 'console=ttyS0' (or console=tty1)

as described in LP: #1061977, passing console=ttyS0 to a system that does not
have serial hardware can result in writes to /dev/console failing. During
enlistment and commissioning, that can also cause those stages to fail as
the enlistment/commissioning process tries to write to stdout, which is attached
to /dev/console by upstart.

This change gives evidence to the requirement for LP: #1044503, as the
only way a user can now add 'console=ttyS0' is by editing files in
/usr/share/pyshared/provisioningserver/pxe which will be overwritten on
package upgrade.

on intel, do not send 'console=ttyS0' (or console=tty1)

as described in LP: #1061977, passing console=ttyS0 to a system that does not
have serial hardware can result in writes to /dev/console failing. During
enlistment and commissioning, that can also cause those stages to fail as
the enlistment/commissioning process tries to write to stdout, which is attached
to /dev/console by upstart.

This change gives evidence to the requirement for LP: #1044503, as the
only way a user can now add 'console=ttyS0' is by editing files in
/usr/share/pyshared/provisioningserver/pxe which will be overwritten on
package upgrade.

[Andres Rodriguez (andreserl)]

looks good to me

[Andres Rodriguez (andreserl)]

review: Approve

[Dave Walker (davewalker)]

What about situations that DO have a serial console (specifically IPMI
linked ones, are of most interest.)

[Scott Moser (smoser)]

The templates for pxe boot or the python code itself will have to be modified by the end user.

[MAAS Lander (maas-lander)]

No commit message specified.

=== modified file 'src/provisioningserver/kernel_opts.py'
--- src/provisioningserver/kernel_opts.py	2012-10-02 18:50:59 +0000
+++ src/provisioningserver/kernel_opts.py	2012-10-09 15:47:19 +0000
@@ -158,8 +158,8 @@
     if (params.arch, params.subarch) == ("armhf", "highbank"):
         return ["console=ttyAMA0"]
     else:
-        # On Intel send kernel output to both console and ttyS0.
-        return ["console=tty1", "console=ttyS0"]
+        # On Intel there are no working sane console= defaults (LP: #1061977)
+        return []
 
 
 def compose_kernel_command_line(params):
 
=== modified file 'src/provisioningserver/tests/test_kernel_opts.py'
--- src/provisioningserver/tests/test_kernel_opts.py	2012-10-02 18:50:59 +0000
+++ src/provisioningserver/tests/test_kernel_opts.py	2012-10-09 15:47:19 +0000
@@ -138,7 +138,7 @@
         # and install command lines.
         get_ephemeral_name = self.patch(kernel_opts, "get_ephemeral_name")
         get_ephemeral_name.return_value = "RELEASE-ARCH"
-        expected = ["console=tty1", "console=ttyS0", "nomodeset"]
+        expected = ["nomodeset"]
 
         params = make_kernel_parameters(
             purpose="commissioning", arch="i386")