diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-05-11 21:33:50 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-05-12 16:59:48 +0100 |
| commit | 10725acf9666c067df569fbcae86b48d8381ac81 (patch) | |
| tree | b25e95730510ba81a0d10de0525617c708964aae /src/launch.c | |
| parent | 5c5979084536b8d03cd7cc37dd5a8a7a0b01fe56 (diff) | |
| download | libguestfs-10725acf9666c067df569fbcae86b48d8381ac81.tar.gz libguestfs-10725acf9666c067df569fbcae86b48d8381ac81.tar.xz libguestfs-10725acf9666c067df569fbcae86b48d8381ac81.zip | |
arm: On Linux ARM kernels, the serial console is ttyAMA0.
Cope with unnecessary lack of standardization.
Diffstat (limited to 'src/launch.c')
| -rw-r--r-- | src/launch.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/launch.c b/src/launch.c index 6332a3df..bb54fb6b 100644 --- a/src/launch.c +++ b/src/launch.c @@ -719,9 +719,15 @@ launch_appliance (guestfs_h *g) add_cmdline (g, NET_IF ",netdev=usernet"); } +#ifdef __arm__ +#define SERIAL_CONSOLE "ttyAMA0" +#else +#define SERIAL_CONSOLE "ttyS0" +#endif + #define LINUX_CMDLINE \ "panic=1 " /* force kernel to panic if daemon exits */ \ - "console=ttyS0 " /* serial console */ \ + "console=" SERIAL_CONSOLE " " /* serial console */ \ "udevtimeout=300 " /* good for very slow systems (RHBZ#480319) */ \ "no_timer_check " /* fix for RHBZ#502058 */ \ "acpi=off " /* we don't need ACPI, turn it off */ \ |