testing: Switch to Debian based guest images
Instead of extracting a downloaded Gentoo filesystem tree into a file containing a reiserfs filesystem, create an ext3 filesystem inside a sparse file, mount it and debootstrap an up-to-date Debian system. Use this image as base for all UML guest images. Also, drop support for the various consoles and use xterm unconditionally.
This commit is contained in:
committed by
Tobias Brunner
parent
0080daa787
commit
aa5803e0e3
+16
-22
@@ -27,7 +27,6 @@ KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
|
||||
# Kernel configuration file
|
||||
KERNELCONFIG=$UMLTESTDIR/.config-3.5
|
||||
|
||||
|
||||
# Bzipped uml patch for kernel
|
||||
UMLPATCH=$UMLTESTDIR/ha-3.0.patch.bz2
|
||||
|
||||
@@ -91,12 +90,6 @@ USE_IFMAP="no"
|
||||
USE_CISCO_QUIRKS="no"
|
||||
USE_UNITY="yes"
|
||||
|
||||
# Gentoo linux root filesystem
|
||||
ROOTFS=$UMLTESTDIR/gentoo-fs-20111212.tar.bz2
|
||||
|
||||
# Size of the finished root filesystem in MB
|
||||
ROOTFSSIZE=850
|
||||
|
||||
# Amount of Memory to use per UML [MB].
|
||||
# If "auto" is stated 1/12 of total host ram will be used.
|
||||
# Examples: MEM=64, MEM="128", MEM="auto"
|
||||
@@ -105,6 +98,20 @@ MEM=96
|
||||
# Directory where the UML kernels and file system will be built
|
||||
BUILDDIR=$UMLTESTDIR/umlbuild
|
||||
|
||||
# Logfile
|
||||
LOGFILE=$BUILDDIR/testing.log
|
||||
|
||||
# Directory used for loop-mounts
|
||||
LOOPDIR=$BUILDDIR/loop
|
||||
|
||||
# Base image settings
|
||||
ROOTFSSIZE=950
|
||||
ROOTFSSUITE=wheezy
|
||||
ROOTFSARCH=amd64
|
||||
ROOTFS=$BUILDDIR/debian-$ROOTFSSUITE-$ROOTFSARCH.img
|
||||
ROOTFSMIRROR=http://cdn.debian.net/debian
|
||||
ROOTFSPW=root
|
||||
|
||||
# Filename of the built UML Kernel
|
||||
UMLKERNEL=$BUILDDIR/linux-uml-$KERNELVERSION
|
||||
|
||||
@@ -126,28 +133,15 @@ TZUML="Europe/Zurich"
|
||||
# Enable particular steps in the make-testing and
|
||||
# start-testing scripts
|
||||
#
|
||||
ENABLE_BUILD_BASEIMAGE="yes"
|
||||
ENABLE_BUILD_UMLKERNEL="yes"
|
||||
ENABLE_BUILD_SSHKEYS="yes"
|
||||
ENABLE_BUILD_HOSTCONFIG="yes"
|
||||
ENABLE_BUILD_UMLROOTFS="yes"
|
||||
ENABLE_BUILD_HOSTCONFIG="yes"
|
||||
ENABLE_BUILD_UMLHOSTFS="yes"
|
||||
ENABLE_START_TESTING="yes"
|
||||
ENABLE_DO_TESTS="no"
|
||||
ENABLE_STOP_TESTING="no"
|
||||
|
||||
##############################################################
|
||||
# How to start the UMLs?
|
||||
#
|
||||
# Start the UML instance in KDE konsole (requires KDE)
|
||||
# UMLSTARTMODE="konsole"
|
||||
# Start the UML instance in a gnome-terminal (requires gnome)
|
||||
UMLSTARTMODE="gnome-terminal"
|
||||
# Start the UML instance in an xterm (requires X11R6)
|
||||
# UMLSTARTMODE="xterm"
|
||||
# Start the UML instance without a terminal window
|
||||
# but screen -r <host> can open a window anytime
|
||||
# UMLSTARTMODE="screen"
|
||||
|
||||
##############################################################
|
||||
# If set to "yes" only the tests stated at $SELECTEDTESTS
|
||||
# will be executed. (use "yes" or "no")
|
||||
|
||||
Reference in New Issue
Block a user