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
+17
-15
@@ -21,6 +21,7 @@ source $DIR/scripts/function.sh
|
||||
[ -f $DIR/testing.conf ] || die "!! Configuration file 'testing.conf' not found."
|
||||
|
||||
source $DIR/testing.conf
|
||||
rm -f $LOGFILE
|
||||
|
||||
if [ "$#" -eq 0 ]
|
||||
then
|
||||
@@ -29,6 +30,16 @@ else
|
||||
HOSTS=$*
|
||||
fi
|
||||
|
||||
##########################################################################
|
||||
# build base image
|
||||
#
|
||||
if [ $ENABLE_BUILD_BASEIMAGE = "yes" ]
|
||||
then
|
||||
cecho "Building base image"
|
||||
$DIR/scripts/build-baseimage
|
||||
fi
|
||||
|
||||
|
||||
##########################################################################
|
||||
# build the UML kernel based on a vanilla kernel form kernel.org
|
||||
# and a matching UML patch from user-mode-linux.sourceforge.net
|
||||
@@ -40,12 +51,13 @@ then
|
||||
fi
|
||||
|
||||
##########################################################################
|
||||
# Adding the ssh RSA public keys to ~/.ssh/known_hosts
|
||||
# build a generic UML root file system based on a Gentoo root file system.
|
||||
# compile and install a specified strongSwan release into the file system.
|
||||
#
|
||||
if [ $ENABLE_BUILD_SSHKEYS = "yes" ]
|
||||
if [ $ENABLE_BUILD_UMLROOTFS = "yes" ]
|
||||
then
|
||||
cecho "Adding ssh public keys of the uml instances (scripts/build-sshkeys)"
|
||||
$DIR/scripts/build-sshkeys
|
||||
cecho "Building uml base image (scripts/build-umlrootfs)"
|
||||
$DIR/scripts/build-umlrootfs
|
||||
fi
|
||||
|
||||
##########################################################################
|
||||
@@ -58,22 +70,12 @@ then
|
||||
$DIR/scripts/build-hostconfig
|
||||
fi
|
||||
|
||||
##########################################################################
|
||||
# build a generic UML root file system based on a Gentoo root file system.
|
||||
# compile and install a specified strongSwan release into the file system.
|
||||
#
|
||||
if [ $ENABLE_BUILD_UMLROOTFS = "yes" ]
|
||||
then
|
||||
cecho "Building uml root file system with strongSwan (scripts/build-umlrootfs)"
|
||||
$DIR/scripts/build-umlrootfs
|
||||
fi
|
||||
|
||||
##########################################################################
|
||||
# Creating the root filesystems for the specified UML instances
|
||||
#
|
||||
if [ $ENABLE_BUILD_UMLHOSTFS = "yes" ]
|
||||
then
|
||||
cecho "Building uml host root file systems (scripts/build-umlhostfs)"
|
||||
cecho "Building uml host images (scripts/build-umlhostfs)"
|
||||
$DIR/scripts/build-umlhostfs $HOSTS
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user