mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ppc64: Use console=hvc0 console=ttyS0.

Browse Source 
console=ttyS0 used to work.  Now it's broken again, and the correct
setting appears to be console=hvc0.  Since we can pass multiple
console settings, do that to try and catch the right console.
This commit is contained in:
Richard W.M. Jones
2014-05-21 09:36:34 +01:00
parent 84189b370a
commit 865f64006e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/launch.c
View File

@@ -302,10 +302,12 @@ guestfs__config (guestfs_h *g,
* Note that this returns a newly allocated buffer which must be freed
* by the caller.
*/
#if defined(__arm__)
#define SERIAL_CONSOLE "ttyAMA0"
#if defined(__powerpc64__)
#define SERIAL_CONSOLE "console=hvc0 console=ttyS0"
#elif defined(__arm__)
#define SERIAL_CONSOLE "console=ttyAMA0"
#else
#define SERIAL_CONSOLE "ttyS0"
#define SERIAL_CONSOLE "console=ttyS0"
#endif
char *
@@ -339,7 +341,7 @@ guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev,
#ifdef __i386__
" noapic" /* workaround for RHBZ#857026 */
#endif
" console=" SERIAL_CONSOLE /* serial console */
" " SERIAL_CONSOLE /* serial console */
" udevtimeout=600" /* good for very slow systems (RHBZ#480319) */
" no_timer_check" /* fix for RHBZ#502058 */
"%s" /* lpj */