From: Tobias Brunner Date: Fri, 10 Oct 2014 15:37:41 +0000 (+0200) Subject: testing: Enable virtio console for guests X-Git-Tag: 5.2.1rc1~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7b2f9379d2c84f3828bcd182b10aced91917309;p=thirdparty%2Fstrongswan.git testing: Enable virtio console for guests This allows accessing the guests with `virsh console `. Using a serial console would also be possible but our kernel configs have no serial drivers enabled, CONFIG_VIRTIO_CONSOLE is enabled though. So to avoid having to recompile the kernels let's do it this way, only requires rebuilding the guest images. References #729. --- diff --git a/testing/config/kvm/alice.xml b/testing/config/kvm/alice.xml index 620ce51167..0bf1eb596c 100644 --- a/testing/config/kvm/alice.xml +++ b/testing/config/kvm/alice.xml @@ -7,7 +7,7 @@ hvm /var/run/kvm-swan-kernel - root=/dev/vda1 loglevel=1 + root=/dev/vda1 loglevel=1 console=hvc0 @@ -53,7 +53,7 @@ - + diff --git a/testing/config/kvm/bob.xml b/testing/config/kvm/bob.xml index caa1631cf0..f2425b222c 100644 --- a/testing/config/kvm/bob.xml +++ b/testing/config/kvm/bob.xml @@ -7,7 +7,7 @@ hvm /var/run/kvm-swan-kernel - root=/dev/vda1 loglevel=1 + root=/dev/vda1 loglevel=1 console=hvc0 @@ -46,7 +46,7 @@ - + diff --git a/testing/config/kvm/carol.xml b/testing/config/kvm/carol.xml index 8f768ff5c5..51a7d83362 100644 --- a/testing/config/kvm/carol.xml +++ b/testing/config/kvm/carol.xml @@ -7,7 +7,7 @@ hvm /var/run/kvm-swan-kernel - root=/dev/vda1 loglevel=1 + root=/dev/vda1 loglevel=1 console=hvc0 @@ -46,7 +46,7 @@ - + diff --git a/testing/config/kvm/dave.xml b/testing/config/kvm/dave.xml index 3ae1da021e..9e26b96291 100644 --- a/testing/config/kvm/dave.xml +++ b/testing/config/kvm/dave.xml @@ -7,7 +7,7 @@ hvm /var/run/kvm-swan-kernel - root=/dev/vda1 loglevel=1 + root=/dev/vda1 loglevel=1 console=hvc0 @@ -46,7 +46,7 @@ - + diff --git a/testing/config/kvm/moon.xml b/testing/config/kvm/moon.xml index 975e3cec61..a7ea6e1206 100644 --- a/testing/config/kvm/moon.xml +++ b/testing/config/kvm/moon.xml @@ -7,7 +7,7 @@ hvm /var/run/kvm-swan-kernel - root=/dev/vda1 loglevel=1 + root=/dev/vda1 loglevel=1 console=hvc0 @@ -53,7 +53,7 @@ - + diff --git a/testing/config/kvm/sun.xml b/testing/config/kvm/sun.xml index 9d05027f9b..b7ddec90e2 100644 --- a/testing/config/kvm/sun.xml +++ b/testing/config/kvm/sun.xml @@ -7,7 +7,7 @@ hvm /var/run/kvm-swan-kernel - root=/dev/vda1 loglevel=1 + root=/dev/vda1 loglevel=1 console=hvc0 @@ -53,7 +53,7 @@ - + diff --git a/testing/config/kvm/venus.xml b/testing/config/kvm/venus.xml index 7a65ace750..acc0d361a2 100644 --- a/testing/config/kvm/venus.xml +++ b/testing/config/kvm/venus.xml @@ -7,7 +7,7 @@ hvm /var/run/kvm-swan-kernel - root=/dev/vda1 loglevel=1 + root=/dev/vda1 loglevel=1 console=hvc0 @@ -46,7 +46,7 @@ - + diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml index 9410c73b86..9dbf3a563a 100644 --- a/testing/config/kvm/winnetou.xml +++ b/testing/config/kvm/winnetou.xml @@ -7,7 +7,7 @@ hvm /var/run/kvm-swan-kernel - root=/dev/vda1 loglevel=1 + root=/dev/vda1 loglevel=1 console=hvc0 @@ -46,7 +46,7 @@ - + diff --git a/testing/hosts/default/etc/inittab b/testing/hosts/default/etc/inittab new file mode 100644 index 0000000000..fbdb702838 --- /dev/null +++ b/testing/hosts/default/etc/inittab @@ -0,0 +1,71 @@ +# /etc/inittab: init(8) configuration. +# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ + +# The default runlevel. +id:2:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin + +# What to do when CTRL-ALT-DEL is pressed. +ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now + +# Action on special keypress (ALT-UpArrow). +#kb::kbrequest:/bin/echo "Keyboard Request--edit /etc/inittab to let this work." + +# What to do when the power fails/returns. +pf::powerwait:/etc/init.d/powerfail start +pn::powerfailnow:/etc/init.d/powerfail now +po::powerokwait:/etc/init.d/powerfail stop + +# /sbin/getty invocations for the runlevels. +# +# The "id" field MUST be the same as the last +# characters of the device (after "tty"). +# +# Format: +# ::: +# +# Note that on most Debian systems tty7 is used by the X Window System, +# so if you want to add more getty's go ahead but skip tty7 if you run X. +# +1:2345:respawn:/sbin/getty 38400 tty1 +2:23:respawn:/sbin/getty 38400 tty2 +3:23:respawn:/sbin/getty 38400 tty3 +4:23:respawn:/sbin/getty 38400 tty4 +5:23:respawn:/sbin/getty 38400 tty5 +6:23:respawn:/sbin/getty 38400 tty6 + +# Example how to put a getty on a serial line (for a terminal) +# +#T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100 +#T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100 + +# Example how to put a getty on a modem line. +# +#T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3 + +# virtio console +V0:12345:respawn:/sbin/getty 38400 hvc0