diff options
Diffstat (limited to 'testing')
-rw-r--r-- | testing/config/kvm/alice.xml | 4 | ||||
-rw-r--r-- | testing/config/kvm/bob.xml | 4 | ||||
-rw-r--r-- | testing/config/kvm/carol.xml | 4 | ||||
-rw-r--r-- | testing/config/kvm/dave.xml | 4 | ||||
-rw-r--r-- | testing/config/kvm/moon.xml | 4 | ||||
-rw-r--r-- | testing/config/kvm/sun.xml | 4 | ||||
-rw-r--r-- | testing/config/kvm/venus.xml | 4 | ||||
-rw-r--r-- | testing/config/kvm/winnetou.xml | 4 | ||||
-rw-r--r-- | testing/hosts/default/etc/inittab | 71 |
9 files changed, 87 insertions, 16 deletions
diff --git a/testing/config/kvm/alice.xml b/testing/config/kvm/alice.xml index 620ce5116..0bf1eb596 100644 --- a/testing/config/kvm/alice.xml +++ b/testing/config/kvm/alice.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> - <cmdline>root=/dev/vda1 loglevel=1</cmdline> + <cmdline>root=/dev/vda1 loglevel=1 console=hvc0</cmdline> <boot dev='hd'/> </os> <features> @@ -53,7 +53,7 @@ <target port='0'/> </serial> <console type='pty'> - <target type='serial' port='0'/> + <target type='virtio' port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> diff --git a/testing/config/kvm/bob.xml b/testing/config/kvm/bob.xml index caa1631cf..f2425b222 100644 --- a/testing/config/kvm/bob.xml +++ b/testing/config/kvm/bob.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> - <cmdline>root=/dev/vda1 loglevel=1</cmdline> + <cmdline>root=/dev/vda1 loglevel=1 console=hvc0</cmdline> <boot dev='hd'/> </os> <features> @@ -46,7 +46,7 @@ <target port='0'/> </serial> <console type='pty'> - <target type='serial' port='0'/> + <target type='virtio' port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> diff --git a/testing/config/kvm/carol.xml b/testing/config/kvm/carol.xml index 8f768ff5c..51a7d8336 100644 --- a/testing/config/kvm/carol.xml +++ b/testing/config/kvm/carol.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> - <cmdline>root=/dev/vda1 loglevel=1</cmdline> + <cmdline>root=/dev/vda1 loglevel=1 console=hvc0</cmdline> <boot dev='hd'/> </os> <features> @@ -46,7 +46,7 @@ <target port='0'/> </serial> <console type='pty'> - <target type='serial' port='0'/> + <target type='virtio' port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> diff --git a/testing/config/kvm/dave.xml b/testing/config/kvm/dave.xml index 3ae1da021..9e26b9629 100644 --- a/testing/config/kvm/dave.xml +++ b/testing/config/kvm/dave.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> - <cmdline>root=/dev/vda1 loglevel=1</cmdline> + <cmdline>root=/dev/vda1 loglevel=1 console=hvc0</cmdline> <boot dev='hd'/> </os> <features> @@ -46,7 +46,7 @@ <target port='0'/> </serial> <console type='pty'> - <target type='serial' port='0'/> + <target type='virtio' port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> diff --git a/testing/config/kvm/moon.xml b/testing/config/kvm/moon.xml index 975e3cec6..a7ea6e120 100644 --- a/testing/config/kvm/moon.xml +++ b/testing/config/kvm/moon.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> - <cmdline>root=/dev/vda1 loglevel=1</cmdline> + <cmdline>root=/dev/vda1 loglevel=1 console=hvc0</cmdline> <boot dev='hd'/> </os> <features> @@ -53,7 +53,7 @@ <target port='0'/> </serial> <console type='pty'> - <target type='serial' port='0'/> + <target type='virtio' port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> diff --git a/testing/config/kvm/sun.xml b/testing/config/kvm/sun.xml index 9d05027f9..b7ddec90e 100644 --- a/testing/config/kvm/sun.xml +++ b/testing/config/kvm/sun.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> - <cmdline>root=/dev/vda1 loglevel=1</cmdline> + <cmdline>root=/dev/vda1 loglevel=1 console=hvc0</cmdline> <boot dev='hd'/> </os> <features> @@ -53,7 +53,7 @@ <target port='0'/> </serial> <console type='pty'> - <target type='serial' port='0'/> + <target type='virtio' port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> diff --git a/testing/config/kvm/venus.xml b/testing/config/kvm/venus.xml index 7a65ace75..acc0d361a 100644 --- a/testing/config/kvm/venus.xml +++ b/testing/config/kvm/venus.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> - <cmdline>root=/dev/vda1 loglevel=1</cmdline> + <cmdline>root=/dev/vda1 loglevel=1 console=hvc0</cmdline> <boot dev='hd'/> </os> <features> @@ -46,7 +46,7 @@ <target port='0'/> </serial> <console type='pty'> - <target type='serial' port='0'/> + <target type='virtio' port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml index 9410c73b8..9dbf3a563 100644 --- a/testing/config/kvm/winnetou.xml +++ b/testing/config/kvm/winnetou.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> - <cmdline>root=/dev/vda1 loglevel=1</cmdline> + <cmdline>root=/dev/vda1 loglevel=1 console=hvc0</cmdline> <boot dev='hd'/> </os> <features> @@ -46,7 +46,7 @@ <target port='0'/> </serial> <console type='pty'> - <target type='serial' port='0'/> + <target type='virtio' port='0'/> </console> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> diff --git a/testing/hosts/default/etc/inittab b/testing/hosts/default/etc/inittab new file mode 100644 index 000000000..fbdb70283 --- /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: +# <id>:<runlevels>:<action>:<process> +# +# 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 |