From 10725acf9666c067df569fbcae86b48d8381ac81 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 11 May 2012 21:33:50 +0100
Subject: arm: On Linux ARM kernels, the serial console is ttyAMA0.

Cope with unnecessary lack of standardization.
---
 src/launch.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 */		\
-- 
cgit