- pass console=ttyS0 to get console output with new xen versions

diff --git a/build b/build
index 5569bd9..025468e 100755 (executable)
--- a/build
+++ b/build
@@ -592,9 +592,9 @@ for SPECFILE in $SPECFILES ; do
        XENID="${XENID##*/}"
        if test "$PERSONALITY" != 0 ; then
            # have to switch back to PER_LINUX to make xm work
-           perl -e 'syscall('$PERSONALITY_SYSCALL', 0); exec(@ARGV) || die("$ARGV[0]: $!\n")' xm create -c $BUILD_DIR/xen.conf name="build:$XENID" $XENMEMORY $XMROOT $XMSWAP extra="init=/.build/build panic=1"
+           perl -e 'syscall('$PERSONALITY_SYSCALL', 0); exec(@ARGV) || die("$ARGV[0]: $!\n")' xm create -c $BUILD_DIR/xen.conf name="build:$XENID" $XENMEMORY $XMROOT $XMSWAP extra="init=/.build/build panic=1 console=ttyS0"
        else
-           xm create -c $BUILD_DIR/xen.conf name="build:$XENID" $XENMEMORY $XMROOT $XMSWAP extra="init=/.build/build panic=1"
+           xm create -c $BUILD_DIR/xen.conf name="build:$XENID" $XENMEMORY $XMROOT $XMSWAP extra="init=/.build/build panic=1 console=ttyS0"
        fi
        if test -n "$XENSWAP" ; then
            BUILDSTATUS=`dd if="$XENSWAP" bs=12 count=1 2>/dev/null`

diff --git a/extractbuild b/extractbuild
index 3c8486d..68b4927 100755 (executable)
--- a/extractbuild
+++ b/extractbuild
@@ -33,7 +33,7 @@ if ($0 ne '/.build/extractbuild') {
   my $xmswap= "disk=file:$xenswap,hda2,w";
   $xmswap= "disk=phy:$xen,hda2,w" if $xenswap =~ /^\/dev\//;
   syscall(135, 0);     # switch back to PER_LINUX to make xm work
-  system('xm', 'create', '-c', "$builddir/xen.conf", "name=build:$xenname", $xmroot, $xmswap, "extra=init=/.build/extractbuild panic=1") && die("xm call failed: $?\n");
+  system('xm', 'create', '-c', "$builddir/xen.conf", "name=build:$xenname", $xmroot, $xmswap, "extra=init=/.build/extractbuild panic=1 console=ttyS0") && die("xm call failed: $?\n");
   exit(0);
 }
 

diff --git a/xen.conf b/xen.conf
index 0d8afdb..553b45a 100644 (file)
--- a/xen.conf
+++ b/xen.conf
@@ -27,7 +27,7 @@ memory = 64
 root = "/dev/hda1 ro"
 
 # Sets init=build, reboot on panic
-extra = "init=/bin/bash panic=1"
+extra = "init=/bin/bash console=ttyS0 panic=1"
 
 on_poweroff = 'destroy'
 on_reboot = 'destroy'