X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=b0e732c4262982cf51c879e386f3f51fa0f06fc9;hb=HEAD;hp=864d99651cb6652b305ebb2ea9b4baa800e9900e;hpb=f9ac8f8b810931843141204958141fd12854320d;p=build.git

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 864d9965..58030ccc 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -1,289 +1,190 @@
 #!/bin/bash
 # -*-shell-*-
 
+# close stdin, as with ubuntu and debian VMs this script tends to hang and wait for input ..
+0<&-
+
 #shopt -s huponexit
 
 COMMAND=$(basename $0)
 DIRNAME=$(dirname $0)
 BUILD_DIR=$(pwd)
 
-# pkgs parsing utilities
-PATH=$(dirname $0):$PATH export PATH
-. build.common
-
-DEFAULT_FCDISTRO=f16
-DEFAULT_PLDISTRO=planetlab
-DEFAULT_PERSONALITY=linux64
+# pkgs parsing utilities + lbuild-bridge.sh
+export PATH=$(dirname $0):$PATH
 
-COMMAND_LBUILD="lbuild-initvm.sh"
-COMMAND_LTEST="ltest-initvm.sh"
-
-libvirt_version="1.0.4"
-
-## stolen from tests/system/template-qemu/qemu-bridge-init
-#################### compute INTERFACE_LAN
-# use /proc/net/dev instead of a hard-wired list
-function gather_interfaces () {
-    python <<EOF
-for line in file("/proc/net/dev"):
-    if ':' not in line: continue
-    ifname=line.replace(" ","").split(":")[0]
-    if ifname.find("lo")==0: continue
-    if ifname.find("br")==0: continue
-    if ifname.find("virbr")==0: continue
-    if ifname.find("tap")==0: continue
-    print ifname
-EOF
-}
-    
-function discover_interface () {
-    for ifname in $(gather_interfaces); do
-	ip link show $ifname | grep -qi 'state UP' && { echo $ifname; return; }
-    done
-    # still not found ? that's bad
-    echo unknown
-}
-DEFAULT_IFNAME=$(discover_interface)
-
-function bridge_init () {
-
-    # turn on verbosity
-    set -x
+# old guests have e.g. mount in /bin but this is no longer part of
+# the standard PATH in recent hosts after usrmove, so let's keep it simple
+export PATH=$PATH:/bin:/sbin
 
-    # constant
-    INTERFACE_BRIDGE=br0
+. build.common
 
-    # Default Value for INTERFACE_LAN
-    INTERFACE_LAN=$(netstat -rn | grep '^0.0.0.0' | awk '{print $8;}')
+# xxx fixme : we pass $lxc around in functions,
+# but in fact then we use lxc_root which is a global..
+# it works, but this really is poor practice
+# we should have an lxc_root function instead
+function lxcroot () {
+    local lxc=$1; shift
+    echo /vservers/$lxc
+}
 
+# XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s
 
-    echo "========== $COMMAND: entering start - beg"
-    hostname
-    uname -a
-    ifconfig
-    netstat -rn
-    echo "========== $COMMAND: entering start - end"
+DEFAULT_FCDISTRO=f39
+DEFAULT_PLDISTRO=lxc
+DEFAULT_PERSONALITY=linux64
+DEFAULT_MEMORY=3072
 
-    # disable netfilter calls for bridge interface (they cause panick on 2.6.35 anyway)
-    #
-    # another option would be to accept the all forward packages for
-    # bridged interface like: -A FORWARD -m physdev --physdev-is-bridged -j ACCEPT
-    sysctl net.bridge.bridge-nf-call-iptables=0
-    sysctl net.bridge.bridge-nf-call-ip6tables=0
-    sysctl net.bridge.bridge-nf-call-arptables=0
+##########
+# constant
+PUBLIC_BRIDGE=br0
 
-    # take extra arg for ifname, if provided
-    [ -n "$1" ] && { INTERFACE_LAN=$1; shift ; }
+# the network interface name as seen from the container
+VIF_GUEST=eth0
 
-    #if we have already configured the same host_box no need to do it again
-    /sbin/ifconfig $INTERFACE_BRIDGE &> /dev/null && {
-        echo "Bridge interface $INTERFACE_BRIDGE already set up - $COMMAND start exiting"
-        return 0
-    }
-    /sbin/ifconfig $INTERFACE_LAN &>/dev/null || {
-        echo "Cannot use interface $INTERFACE_LAN - exiting"
-        exit 1
-    }
-
-    
-    #Getting host IP/masklen
-    address=$(/sbin/ip addr show $INTERFACE_LAN | grep -v inet6 | grep inet | head --lines=1 | awk '{print $2;}')
-    [ -z "$address" ] && { echo "ERROR: Could not determine IP address for $INTERFACE_LAN" ; exit 1 ; }
-
-    broadcast=$(/sbin/ip addr show $INTERFACE_LAN | grep -v inet6 | grep inet | head --lines=1 | awk '{print $4;}')
-    [ -z "$broadcast" ] && echo "WARNING: Could not determine broadcast address for $INTERFACE_LAN"
-
-    gateway=$(netstat -rn | grep '^0.0.0.0' | awk '{print $2;}')
-    [ -z "$gateway" ] && echo "WARNING: Could not determine gateway IP"
-
-    # creating the bridge
-    echo "Creating bridge INTERFACE_BRIDGE=$INTERFACE_BRIDGE"
-    brctl addbr $INTERFACE_BRIDGE
-    #brctl stp $INTERFACE_BRIDGE yes
-    brctl addif $INTERFACE_BRIDGE $INTERFACE_LAN
-    echo "Activating promiscuous mode INTERFACE_LAN=$INTERFACE_LAN"
-    /sbin/ifconfig $INTERFACE_LAN 0.0.0.0 promisc up
-    sleep 2
-    echo "Setting bridge address=$address broadcast=$broadcast"
-    # static
-    #/sbin/ifconfig $INTERFACE_BRIDGE $address broadcast $broadcast up
-    dhclient $INTERFACE_BRIDGE
-    sleep 1
-
-    #Reconfigure the routing table
-    echo "Configuring gateway=$gateway"
-    route add default gw $gateway
-
-    echo "========== $COMMAND: exiting start - beg"
-    ifconfig
-    netstat -rn
-    echo "========== $COMMAND: exiting start - end"
-
-
-return 0
+##########
+FEDORA_MIRROR="http://mirror.onelab.eu/"
+FEDORA_MIRROR_KEYS="http://mirror.onelab.eu/keys/"
+FEDORA_PREINSTALLED="dnf dnf-yum passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients"
+DEBIAN_PREINSTALLED="openssh-server openssh-client"
 
+########## networking utilities
+function gethostbyname () {
+    local hostname=$1
+    python3 -c "import socket; print(socket.gethostbyname('"$hostname"'))" 2> /dev/null
 }
 
-
-function failure () {
-    echo "$COMMAND : Bailing out"
-    exit 1
+# e.g. 21 -> 255.255.248.0
+function masklen_to_netmask () {
+    local masklen=$1; shift
+    python3 <<EOF
+import sys
+masklen = $masklen
+if not (1 <= masklen <= 32):
+  print("Wrong masklen", masklen)
+  exit(1)
+result = []
+for i in range(4):
+    if masklen >= 8:
+       result.append(8)
+       masklen -= 8
+    else:
+       result.append(masklen)
+       masklen = 0
+print(".".join([ str(256-2**(8-i)) for i in result ]))
+EOF
 }
 
-function cidr_notation () {
-
-netmask=$1; shift
-cidr=0
-for i in $(seq 1 4) ; do
-    part=$(echo $netmask | cut -d. -f $i)
-    case $part in
-        "255") cidr=$((cidr + 8));;
-        "254") cidr=$((cidr + 7));;
-        "252") cidr=$((cidr + 6));;
-        "248") cidr=$((cidr + 5));;
-        "240") cidr=$((cidr + 4));;
-        "224") cidr=$((cidr + 3));;
-        "192") cidr=$((cidr + 2));;
-        "128") cidr=$((cidr + 1));;
-        "0") cidr=$((cidr + 0));;
-     esac
-done
-echo $cidr
-
+##############################
+# return dnf or debootstrap
+function package_method () {
+    local fcdistro=$1; shift
+    case $fcdistro in
+        f[0-9]*|centos[0-9]*|sl[0-9]*)
+            echo dnf ;;
+        wheezy|jessie|trusty|xenial|bionic|focal|jammy)
+            echo debootstrap ;;
+        *)
+            echo "Unknown package_method for distro $fcdistro" ;;
+    esac
 }
 
-function check_yum_installed () {
-    package=$1; shift
-    rpm -q $package >& /dev/null || yum -y install $package
+### return
+# ifcfg          for fedora up to 36
+# networkmanager for fedora starting with f37 (probably works with older as well...)
+# interfaces     for older debian/uuntu
+# systemd        for more recent debian/ubuntu
+function network_config_method () {
+    local fcdistro=$1; shift
+    case $fcdistro in
+        # have not used centos or scientific linux for a very long time
+        #f[0-9]*|centos[0-9]*|sl[0-9]*)
+        f2*|f3[0-6])
+            echo ifcfg ;;
+        f3[7-9]|f[4-9]*)
+            echo networkmanager ;;
+        wheezy|jessie|trusty|xenial|bionic)
+            echo interfaces ;;
+        focal|jammy)
+            echo systemd ;;
+        *)
+            echo "Unknown network_config_method for distro $fcdistro" ;;
+    esac
 }
 
-function check_yumgroup_installed () {
-    group="$1"; shift
-    yum grouplist "$group" | grep -q Installed || { yum -y groupinstall "$group" ; }
+# return arch from debian distro and personality
+function canonical_arch () {
+    local personality=$1; shift
+    local fcdistro=$1; shift
+    case $(package_method $fcdistro) in
+        dnf)
+            case $personality in
+                *32) echo i386 ;;
+                *64) echo x86_64 ;;
+                *) echo Unknown-arch-1 ;;
+            esac ;;
+        debootstrap)
+            case $personality in
+                *32) echo i386 ;;
+                *64) echo amd64 ;;
+                *) echo Unknown-arch-2 ;;
+            esac ;;
+        *)
+            echo Unknown-arch-3 ;;
+    esac
 }
 
-function prepare_host() {
-   
-### Thierry - jan 14 - turning off this check as our boxes now meet this req.
-### and I'm trying out f20's stock libvirt instead    
-#    ## check if libvirt_version is installed
-#    virsh -v | grep -e $libvirt_version || { echo "$libvirt_version needs to be installed!!!" ; exit 1 ; }
-
-    #################### bride initialization
-    check_yum_installed bridge-utils
-    #Bridge init
-    isInstalled=$(netstat -rn | grep '^0.0.0.0' | awk '{print $8;}')
-    if [ "$isInstalled" != "br0" ] ; then
-	bridge_init
-        sleep 5
-    fi
-
-    return 0
+# the new test framework creates /timestamp in /vservers/<name> *before* populating it
+function almost_empty () {
+    local dir="$1"; shift ;
+    # non existing is fine
+    [ ! -d $dir ] && return 0;
+    # need to have at most one file
+    local count=$(cd $dir; ls | wc -l)
+    [ $count -le 1 ]
 }
 
+##############################
+function fedora_install() {
+    set -x
+    set -e
 
+    local lxc=$1; shift
+    local lxc_root=$(lxcroot $lxc)
 
-function configure_fedora() {
+    local cache=/var/cache/lxc/fedora/$arch/${fedora_release}
+    mkdir -p $cache
 
-    # disable selinux in fedora
-    mkdir -p $rootfs_path/selinux
-    echo 0 > $rootfs_path/selinux/enforce
-
-   # configure the network 
+    (
+        flock --exclusive --timeout 60 200 || { echo "Cache repository is busy." ; return 1 ; }
 
-    cat <<EOF > ${rootfs_path}/etc/sysconfig/network-scripts/ifcfg-$IFNAME
-DEVICE=$IFNAME
-BOOTPROTO=static
-ONBOOT=yes
-HOSTNAME=$HOSTNAME
-IPADDR=$IP
-NETMASK=$NETMASK
-GATEWAY=$GATEWAY
-NM_CONTROLLED=no
-TYPE=Ethernet
-MTU=1500
-EOF
+        if [ ! -e "$cache/rootfs" ]; then
+            echo "Getting cache download in $cache/rootfs ... "
+            fedora_download $cache || { echo "Failed to download 'fedora base'"; return 1; }
+        else
+            echo "Updating cache $cache/rootfs ..."
+            if ! dnf --installroot $cache/rootfs --releasever=${fedora_release} -y --nogpgcheck update ; then
+                echo "Failed to update 'fedora base', continuing with last known good cache"
+            else
+                echo "Update finished"
+            fi
+        fi
 
-    # set the hostname
-    case "$fcdistro" in 
-	f18|f2?)
-	    cat <<EOF > ${rootfs_path}/etc/hostname
-$HOSTNAME
-EOF
-	    echo ;;
-	*)
-            cat <<EOF > ${rootfs_path}/etc/sysconfig/network
-NETWORKING=yes
-HOSTNAME=$HOSTNAME
-EOF
-            # set minimal hosts
-	    cat <<EOF > $rootfs_path/etc/hosts
-127.0.0.1 localhost $HOSTNAME
-EOF
-	    echo ;;
-    esac
+        echo "Filling $lxc_root from $cache/rootfs ... "
+        rsync -a $cache/rootfs/ $lxc_root/
 
-    dev_path="${rootfs_path}/dev"
-    rm -rf $dev_path
-    mkdir -p $dev_path
-    mknod -m 666 ${dev_path}/null c 1 3
-    mknod -m 666 ${dev_path}/zero c 1 5
-    mknod -m 666 ${dev_path}/random c 1 8
-    mknod -m 666 ${dev_path}/urandom c 1 9
-    mkdir -m 755 ${dev_path}/pts
-    mkdir -m 1777 ${dev_path}/shm
-    mknod -m 666 ${dev_path}/tty c 5 0
-    mknod -m 666 ${dev_path}/tty0 c 4 0
-    mknod -m 666 ${dev_path}/tty1 c 4 1
-    mknod -m 666 ${dev_path}/tty2 c 4 2
-    mknod -m 666 ${dev_path}/tty3 c 4 3
-    mknod -m 666 ${dev_path}/tty4 c 4 4
-    mknod -m 600 ${dev_path}/console c 5 1
-    mknod -m 666 ${dev_path}/full c 1 7
-    mknod -m 600 ${dev_path}/initctl p
-    mknod -m 666 ${dev_path}/ptmx c 5 2
+        return 0
 
-    #echo "setting root passwd to $root_password"
-    #echo "root:$root_password" | chroot $rootfs_path chpasswd
+        ) 200> $cache/lock
 
-    return 0
+    return $?
 }
 
+function fedora_download() {
+    set -x
 
-function configure_fedora_init() {
+    local cache=$1; shift
 
-    sed -i 's|.sbin.start_udev||' ${rootfs_path}/etc/rc.sysinit
-    sed -i 's|.sbin.start_udev||' ${rootfs_path}/etc/rc.d/rc.sysinit
-    # don't mount devpts, for pete's sake
-    sed -i 's/^.*dev.pts.*$/#\0/' ${rootfs_path}/etc/rc.sysinit
-    sed -i 's/^.*dev.pts.*$/#\0/' ${rootfs_path}/etc/rc.d/rc.sysinit
-    chroot ${rootfs_path} /sbin/chkconfig udev-post off
-    chroot ${rootfs_path} /sbin/chkconfig network on
-}
-
-# this code of course is for guests that do run on systemd
-function configure_fedora_systemd() {
-    # so ignore if we can't find /etc/systemd at all 
-    [ -d ${rootfs_path}/etc/systemd ] || return 0
-    # otherwise let's proceed
-    ln -sf /lib/systemd/system/multi-user.target ${rootfs_path}/etc/systemd/system/default.target
-    touch ${rootfs_path}/etc/fstab
-    ln -sf /dev/null ${rootfs_path}/etc/systemd/system/udev.service
-# Thierry - Feb 2013
-# this was intended for f16 initially, in order to enable getty that otherwise would not start
-# having a getty running is helpful only if ssh won't start though, and we see a correlation between
-# VM's that refuse to lxc-stop and VM's that run crazy getty's
-# so, turning getty off for now instead
-#   #dependency on a device unit fails it specially that we disabled udev
-#    sed -i 's/After=dev-%i.device/After=/' ${rootfs_path}/lib/systemd/system/getty\@.service
-    ln -sf /dev/null ${rootfs_path}/etc/systemd/system/"getty@.service"
-    rm -f ${rootfs_path}/etc/systemd/system/getty.target.wants/*service || :
-# can't seem to handle this one with systemctl
-    chroot ${rootfs_path} /sbin/chkconfig network on
-}
-
-function download_fedora() {
-set -x
     # check the mini fedora was not already downloaded
     INSTALL_ROOT=$cache/partial
     echo $INSTALL_ROOT
@@ -291,67 +192,66 @@ set -x
     # download a mini fedora into a cache
     echo "Downloading fedora minimal ..."
 
-    mkdir -p $INSTALL_ROOT
-    if [ $? -ne 0 ]; then
-        echo "Failed to create '$INSTALL_ROOT' directory"
-        return 1
-    fi
+    mkdir -p $INSTALL_ROOT || { echo "Failed to create '$INSTALL_ROOT' directory" ; return 1; }
 
-    mkdir -p $INSTALL_ROOT/etc/yum.repos.d   
+    mkdir -p $INSTALL_ROOT/etc/yum.repos.d
     mkdir -p $INSTALL_ROOT/dev
     mknod -m 0444 $INSTALL_ROOT/dev/random c 1 8
     mknod -m 0444 $INSTALL_ROOT/dev/urandom c 1 9
 
     # copy yum config and repo files
     cp /etc/yum.conf $INSTALL_ROOT/etc/
-    cp /etc/yum.repos.d/fedora* $INSTALL_ROOT/etc/yum.repos.d/
-
-    # append fedora repo files with desired $release and $basearch
-    for f in $INSTALL_ROOT/etc/yum.repos.d/*
-    do
-      sed -i "s/\$basearch/$arch/g; s/\$releasever/$release/g;" $f
-    done 
-
-    MIRROR_URL=http://mirror.onelab.eu/fedora/releases/$release/Everything/$arch/os
-    RELEASE_URL1="$MIRROR_URL/Packages/fedora-release-$release-1.noarch.rpm"
-    # with fedora18 the rpms are scattered by first name
-    RELEASE_URL2="$MIRROR_URL/Packages/f/fedora-release-$release-1.noarch.rpm"
-    RELEASE_TARGET=$INSTALL_ROOT/fedora-release-$release.noarch.rpm
-    found=""
-    for attempt in $RELEASE_URL1 $RELEASE_URL2; do
-	if curl -f $attempt -o $RELEASE_TARGET ; then
-	    echo "Retrieved $attempt"
-	    found=true
-	    break
-	else
-	    echo "Failed attempt $attempt"
-	fi
-    done
-    [ -n "$found" ] || { echo "Could not retrieve fedora-release rpm - exiting" ; exit 1; }
-    
+    cp /etc/yum.repos.d/fedora{,-updates}.repo $INSTALL_ROOT/etc/yum.repos.d/
+
+    # append fedora repo files with hardwired releasever and basearch
+    if [ -z "$USE_UPSTREAM_REPOS" ]; then
+        for f in $INSTALL_ROOT/etc/yum.repos.d/* ; do
+            sed -i "s/\$basearch/$arch/g; s/\$releasever/${fedora_release}/g;" $f
+        done
+    fi
+
+# looks like all this business about fetching fedora-release is not needed
+# it does
+#    MIRROR_URL=$FEDORA_MIRROR/fedora/releases/${fedora_release}/Everything/$arch/os
+#    # since fedora18 the rpms are scattered by first name
+#    # first try the second version of fedora-release first
+#    RELEASE_URLS=""
+#    local subindex
+#    for subindex in 3 2 1; do
+#        RELEASE_URLS="$RELEASE_URLS $MIRROR_URL/Packages/f/fedora-release-${fedora_release}-${subindex}.noarch.rpm"
+#    done
+#
+#    RELEASE_TARGET=$INSTALL_ROOT/fedora-release-${fedora_release}.noarch.rpm
+#    local found=""
+#    local attempt
+#    for attempt in $RELEASE_URLS; do
+#        if curl --silent --fail $attempt -o $RELEASE_TARGET; then
+#            echo "Successfully Retrieved $attempt"
+#            found=true
+#            break
+#        else
+#            echo "Failed (not to worry about) with attempt $attempt"
+#        fi
+#    done
+#    [ -n "$found" ] || { echo "Could not retrieve fedora-release rpm - exiting" ; exit 1; }
+
     mkdir -p $INSTALL_ROOT/var/lib/rpm
     rpm --root $INSTALL_ROOT  --initdb
     # when installing f12 this apparently is already present, so ignore result
-    rpm --root $INSTALL_ROOT -ivh $INSTALL_ROOT/fedora-release-$release.noarch.rpm || :
+#    rpm --root $INSTALL_ROOT -ivh $INSTALL_ROOT/fedora-release-${fedora_release}.noarch.rpm || :
     # however f12 root images won't get created on a f18 host
     # (the issue here is the same as the one we ran into when dealing with a vs-box)
     # in a nutshell, in f12 the glibc-common and filesystem rpms have an apparent conflict
-    # >>> file /usr/lib/locale from install of glibc-common-2.11.2-3.x86_64 conflicts 
+    # >>> file /usr/lib/locale from install of glibc-common-2.11.2-3.x86_64 conflicts
     #          with file from package filesystem-2.4.30-2.fc12.x86_64
-    # in fact this was - of course - allowed by f12's rpm but later on a fix was made 
+    # in fact this was - of course - allowed by f12's rpm but later on a fix was made
     #   http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=cf1095648194104a81a58abead05974a5bfa3b9a
     # So ideally if we want to be able to build f12 images from f18 we need an rpm that has
     # this patch undone, like we have in place on our f14 boxes (our f14 boxes need a f18-like rpm)
 
-    YUM="yum --installroot=$INSTALL_ROOT --nogpgcheck -y"
-    PKG_LIST="yum initscripts passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients"
-    echo "$YUM install $PKG_LIST"
-    $YUM install $PKG_LIST
-
-    if [ $? -ne 0 ]; then
-        echo "Failed to download the rootfs, aborting."
-        return 1
-    fi
+    DNF="dnf --installroot=$INSTALL_ROOT --nogpgcheck -y --releasever=${fedora_release}"
+    echo "$DNF install $FEDORA_PREINSTALLED"
+    $DNF install $FEDORA_PREINSTALLED || { echo "Failed to download rootfs, aborting." ; return 1; }
 
     mv "$INSTALL_ROOT" "$cache/rootfs"
     echo "Download complete."
@@ -359,268 +259,368 @@ set -x
     return 0
 }
 
+##############################
+function fedora_configure() {
 
-function copy_fedora() {
-set -x
-    # make a local copy of the minifedora
-    echo -n "Copying rootfs to $rootfs_path ..."
-    mkdir -p $rootfs_path
-    rsync -a $cache/rootfs/ $rootfs_path/
-    return 0
-}
-
-
-function update_fedora() {
-set -x
-    YUM="yum --installroot $cache/rootfs -y --nogpgcheck"
-    $YUM update
-}
-
-
-function install_fedora() {
     set -x
+    set -e
 
-    mkdir -p /var/lock/subsys/
-    (
-        flock -n -x 200
-        if [ $? -ne 0 ]; then
-            echo "Cache repository is busy."
-            return 1
-        fi
-
-        echo "Checking cache download in $cache/rootfs ... "
-        if [ ! -e "$cache/rootfs" ]; then
-            download_fedora
-            if [ $? -ne 0 ]; then
-                echo "Failed to download 'fedora base'"
-                return 1
-            fi
-        else
-            echo "Cache found. Updating..."
-            update_fedora
-            if [ $? -ne 0 ]; then
-                echo "Failed to update 'fedora base', continuing with last known good cache"
-            else
-                echo "Update finished"
-            fi
-        fi
-
-        echo "Copy $cache/rootfs to $rootfs_path ... "
-        copy_fedora
-        if [ $? -ne 0 ]; then
-            echo "Failed to copy rootfs"
-            return 1
-        fi
-
-        return 0
-
-        ) 200>/var/lock/subsys/lxc
-
-    return $?
-}
+    local lxc=$1; shift
+    local fcdistro=$1; shift
+    local lxc_root=$(lxcroot $lxc)
 
+    # disable selinux in fedora
+    mkdir -p $lxc_root/selinux
+    echo 0 > $lxc_root/selinux/enforce
 
-function copy_configuration() {
-
-    mkdir -p $config_path
-    cat <<EOF >> $config_path/config
-lxc.utsname = $lxc
-lxc.arch = $arch2
-lxc.tty = 4
-lxc.pts = 1024
-lxc.rootfs = $rootfs_path
-lxc.mount  = $config_path/fstab
-#networking
-lxc.network.type = $lxc_network_type
-lxc.network.flags = up
-lxc.network.link = $lxc_network_link
-lxc.network.name = $IFNAME
-lxc.network.mtu = 1500
-lxc.network.ipv4 = $IP/$CIDR
-lxc.network.veth.pair = $veth_pair
-#cgroups
-#lxc.cgroup.devices.deny = a
-# /dev/null and zero
-lxc.cgroup.devices.allow = c 1:3 rwm
-lxc.cgroup.devices.allow = c 1:5 rwm
-# consoles
-lxc.cgroup.devices.allow = c 5:1 rwm
-lxc.cgroup.devices.allow = c 5:0 rwm
-lxc.cgroup.devices.allow = c 4:0 rwm
-lxc.cgroup.devices.allow = c 4:1 rwm
-# /dev/{,u}random
-lxc.cgroup.devices.allow = c 1:9 rwm
-lxc.cgroup.devices.allow = c 1:8 rwm
-lxc.cgroup.devices.allow = c 136:* rwm
-lxc.cgroup.devices.allow = c 5:2 rwm
-# rtc
-lxc.cgroup.devices.allow = c 254:0 rwm
-lxc.cgroup.devices.allow = b 255:0 rwm
+    # enable networking and set hostname
+    cat <<EOF > ${lxc_root}/etc/sysconfig/network
+NETWORKING=yes
+EOF
+    cat <<EOF > ${lxc_root}/etc/hostname
+$GUEST_HOSTNAME
 EOF
 
+    local dev_path="${lxc_root}/dev"
+    rm -rf $dev_path
+    mkdir -p $dev_path
+    mknod -m 666 ${dev_path}/null c 1 3
+    mknod -m 666 ${dev_path}/zero c 1 5
+    mknod -m 666 ${dev_path}/random c 1 8
+    mknod -m 666 ${dev_path}/urandom c 1 9
+    mkdir -m 755 ${dev_path}/pts
+    mkdir -m 1777 ${dev_path}/shm
+    mknod -m 666 ${dev_path}/tty c 5 0
+    mknod -m 666 ${dev_path}/tty0 c 4 0
+    mknod -m 666 ${dev_path}/tty1 c 4 1
+    mknod -m 666 ${dev_path}/tty2 c 4 2
+    mknod -m 666 ${dev_path}/tty3 c 4 3
+    mknod -m 666 ${dev_path}/tty4 c 4 4
+    mknod -m 600 ${dev_path}/console c 5 1
+    mknod -m 666 ${dev_path}/full c 1 7
+    mknod -m 600 ${dev_path}/initctl p
+    mknod -m 666 ${dev_path}/ptmx c 5 2
 
+    fedora_configure_systemd $lxc
 
-    cat <<EOF > $config_path/fstab
-proc            $rootfs_path/proc         proc    nodev,noexec,nosuid 0 0
-devpts          $rootfs_path/dev/pts      devpts defaults 0 0
-sysfs           $rootfs_path/sys          sysfs defaults  0 0
-EOF
-    if [ $? -ne 0 ]; then
-        echo "Failed to add configuration"
-        return 1
-    fi
+    fedora_configure_network $lxc
+
+    [ -z "$IMAGE" ] && fedora_configure_yum $lxc $fcdistro $pldistro
 
     return 0
 }
 
+function fedora_configure_network() {
+    local lxc="$1"
+    case $(network_config_method $fcdistro) in
+        ifcfg)
+            # probably no longer useful
+            local guest_ifcfg=${lxc_root}/etc/sysconfig/network-scripts/ifcfg-$VIF_GUEST
+            mkdir -p $(dirname ${guest_ifcfg})
+            if [ -n "$NAT_MODE" ]; then
+                write_guest_ifcfg_natip
+            else
+                write_guest_ifcfg_publicip
+            fi > $guest_ifcfg
+            ;;
+        networkmanager)
+            local guest_keyfile=${lxc_root}/etc/NetworkManager/system-connections/'Wired connection 1.nmconnection'
+            mkdir -p $(dirname "${guest_keyfile}")
+            if [ -n "$NAT_MODE" ]; then
+                write_guest_networkmanager_natip
+            else
+                write_guest_networkmanager_publicip
+            fi > "$guest_keyfile"
+            chmod 600 "$guest_keyfile"
+            ;;
+    esac
+}
 
+# this code of course is for guests that do run on systemd
+function fedora_configure_systemd() {
+    set -e
+    set -x
+    local lxc=$1; shift
+    local lxc_root=$(lxcroot $lxc)
 
+    # so ignore if we can't find /etc/systemd at all
+    [ -d ${lxc_root}/etc/systemd ] || return 0
+    # otherwise let's proceed
+    ln -sf /lib/systemd/system/multi-user.target ${lxc_root}/etc/systemd/system/default.target
+    touch ${lxc_root}/etc/fstab
+    ln -sf /dev/null ${lxc_root}/etc/systemd/system/udev.service
+# Thierry - Feb 2013 relying on getty is looking for trouble
+# so, turning getty off for now instead
+#    sed -i 's/After=dev-%i.device/After=/' ${lxc_root}/lib/systemd/system/getty\@.service
+    ln -sf /dev/null ${lxc_root}/etc/systemd/system/"getty@.service"
+    rm -f ${lxc_root}/etc/systemd/system/getty.target.wants/*service || :
+    chroot ${lxc_root} $personality systemctl enable NetworkManager
+}
 
-# overwrite lxc's internal yum config
-function configure_yum_in_lxc () {
-    set -x 
-    set -e 
+# overwrite container yum config
+function fedora_configure_yum () {
+    set -x
+    set -e
     trap failure ERR INT
 
-    lxc=$1; shift
-    fcdistro=$1; shift
-    pldistro=$1; shift
+    local lxc=$1; shift
+    local fcdistro=$1; shift
+    local pldistro=$1; shift
 
-    echo "Initializing yum.repos.d in $lxc"
-    rm -f $rootfs_path/etc/yum.repos.d/*
+    local lxc_root=$(lxcroot $lxc)
+    # rpm --rebuilddb
+    chroot ${lxc_root} $personality rpm --rebuilddb
 
-    cat > $rootfs_path/etc/yum.repos.d/building.repo <<EOF
-[fedora]
-name=Fedora $release - $arch
-baseurl=http://mirror.onelab.eu/fedora/releases/$release/Everything/$arch/os/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-$release-primary
+    if [ -z "$USE_UPSTREAM_REPOS" ]; then
+        echo "Initializing yum.repos.d in $lxc"
+        rm -f $lxc_root/etc/yum.repos.d/*
 
-[updates]
-name=Fedora $release - $arch - Updates
-baseurl=http://mirror.onelab.eu/fedora/updates/$release/$arch/
-enabled=1
-metadata_expire=7d
-gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-$release-primary
-EOF
-    
-    # for using vtest-init-lxc.sh as a general-purpose lxc creation wrapper
+        # use mirroring/ stuff instead of a hard-wired config
+        local repofile=$lxc_root/etc/yum.repos.d/building.repo
+        yumconf_mirrors $repofile ${DIRNAME} $fcdistro "" $FEDORA_MIRROR
+        # the keys stuff requires adjustment though
+        sed -i $repofile -e s,'gpgkey=.*',"gpgkey=${FEDORA_MIRROR_KEYS}/RPM-GPG-KEY-fedora-${fedora_release}-primary,"
+    fi
+    # import fedora key so that gpgckeck does not whine or require stdin
+    # required since fedora24
+    rpm --root $lxc_root --import $FEDORA_MIRROR_KEYS/RPM-GPG-KEY-fedora-${fedora_release}-primary
+
+    # for using this script as a general-purpose lxc creation wrapper
     # just mention 'none' as the repo url
-    if [ -n "$TEST_MODE" -a "$REPO_URL" != "none" ] ; then
-	if [ ! -d $rootfs_path/etc/yum.repos.d ] ; then
-	    echo "WARNING : cannot create myplc repo"
-	else
-            # exclude kernel from fedora repos 
-	    yumexclude=$(pl_plcyumexclude $fcdistro $pldistro $DIRNAME)
-	    for repo in $rootfs_path/etc/yum.repos.d/* ; do
-		[ -f $repo ] && yumconf_exclude $repo "exclude=$yumexclude" 
-	    done
-	    # the build repo is not signed at this stage
-	    cat > $rootfs_path/etc/yum.repos.d/myplc.repo <<EOF
+    if [ -n "$MYPLC_REPO_URL" ] ; then
+        if [ ! -d $lxc_root/etc/yum.repos.d ] ; then
+            echo "WARNING : cannot create myplc repo"
+        else
+            # exclude kernel from fedora repos
+            yumexclude=$(pl_plcyumexclude $fcdistro $pldistro $DIRNAME)
+            for repo in $lxc_root/etc/yum.repos.d/* ; do
+                [ -f $repo ] && yumconf_exclude $repo "exclude=$yumexclude"
+            done
+            # the build repo is not signed at this stage
+            cat > $lxc_root/etc/yum.repos.d/myplc.repo <<EOF
 [myplc]
 name= MyPLC
-baseurl=$REPO_URL
+baseurl=$MYPLC_REPO_URL
 enabled=1
 gpgcheck=0
 EOF
-	fi
+        fi
     fi
-}    
+}
 
-# return yum or debootstrap
-function package_method () {
-    fcdistro=$1; shift
+##############################
+# apparently ubuntu exposes a mirrors list by country at
+# http://mirrors.ubuntu.com/mirrors.txt
+# need to specify the right mirror for debian variants like ubuntu and the like
+function debian_mirror () {
+    local fcdistro=$1; shift
     case $fcdistro in
-	f[0-9]*|centos[0-9]*|sl[0-9]*) echo yum ;;
-	lenny|etch) echo debootstrap ;;
-	*) echo Unknown distro $fcdistro ;;
-    esac 
+        wheezy|jessie)
+            echo http://ftp2.fr.debian.org/debian/ ;;
+        trusty|xenial|bionic|focal|jammy)
+            echo http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ ;;
+        *) echo unknown distro $fcdistro; exit 1;;
+    esac
 }
 
-# return arch from debian distro and personality
-function canonical_arch () {
-    personality=$1; shift
-    fcdistro=$1; shift
-    case $(package_method $fcdistro) in
-	yum)
-	    case $personality in *32) echo i386 ;; *64) echo x86_64 ;; *) echo Unknown-arch-1 ;; esac ;;
-	debootstrap)
-	    case $personality in *32) echo i386 ;; *64) echo amd64 ;; *) echo Unknown-arch-2 ;; esac ;;
-	*)
-	    echo Unknown-arch-3 ;;
+function debian_install () {
+    set -e
+    set -x
+    local lxc=$1; shift
+    local lxc_root=$(lxcroot $lxc)
+    mkdir -p $lxc_root
+    local arch=$(canonical_arch $personality $fcdistro)
+    local mirror=$(debian_mirror $fcdistro)
+    debootstrap --no-check-gpg --arch $arch $fcdistro $lxc_root $mirror
+    # just like with fedora we ensure a few packages get installed as well
+    # not started yet
+    #virsh -c lxc:/// lxc-enter-namespace $lxc /usr/bin/$personality /bin/bash -c "apt-get update"
+    #virsh -c lxc:/// lxc-enter-namespace $lxc /usr/bin/$personality /bin/bash -c "apt-get -y install $DEBIAN_PREINSTALLED"
+    chroot ${lxc_root} $personality apt-get update
+    chroot ${lxc_root} $personality apt-get -y install $DEBIAN_PREINSTALLED
+    # configure hostname
+    cat <<EOF > ${lxc_root}/etc/hostname
+$GUEST_HOSTNAME
+EOF
+
+}
+
+function debian_configure () {
+    local lxc=$1; shift
+    local fcdistro=$1; shift
+    case $(network_config_method $fcdistro) in
+        interfaces)
+            local guest_interfaces=${lxc_root}/etc/network/interfaces
+            ( [ -n "$NAT_MODE" ] \
+                && write_guest_interfaces_natip \
+                || write_guest_interfaces_publicip ) > $guest_interfaces
+            ;;
+        systemd)
+            local systemd_config="${lxc_root}/etc/systemd/network/wired.network"
+            ( [ -n "$NAT_MODE" ] \
+                && write_guest_systemd_natip \
+                || write_guest_systemd_publicip ) > $systemd_config
+            chroot "${lxc_root}" systemctl enable systemd-networkd
+            ;;
     esac
 }
 
-# the new test framework creates /timestamp in /vservers/<name> *before* populating it
-function almost_empty () { 
-    dir="$1"; shift ; 
-    # non existing is fine
-    [ ! -d $dir ] && return 0; 
-    # need to have at most one file
-    count=$(cd $dir; ls | wc -l); [ $count -le 1 ]; 
+function write_guest_interfaces_natip () {
+    cat <<EOF
+auto $VIF_GUEST
+iface $VIF_GUEST inet dhcp
+EOF
+}
+
+function write_guest_interfaces_publicip () {
+    cat <<EOF
+auto $VIF_GUEST
+iface $VIF_GUEST inet static
+address $GUEST_IP
+netmask $NETMASK
+gateway $GATEWAY
+EOF
+}
+
+# systemd-networkd
+#   https://wiki.archlinux.org/title/systemd-networkd
+#   https://www.linuxtricks.fr/wiki/systemd-le-reseau-avec-systemd-networkd
+function write_guest_systemd_natip () {
+    cat << EOF
+[Match]
+Name=eth0
+
+[Network]
+DHCP=ipv4
+EOF
+}
+
+function write_guest_systemd_publicip () {
+    cat << EOF
+[Match]
+Name=eth0
+
+[Network]
+Address=${GUEST_IP}/${MASKLEN}
+Gateway=$GATEWAY
+EOF
 }
 
+function uuid() {
+    python -c "import uuid; print(uuid.uuid1())"
+}
+# xxx this seems to be no longer needed ?
+function write_guest_networkmanager_natip() {
+    cat << EOF
+EOF
+}
+function write_guest_networkmanager_publicip() {
+    cat << EOF
+[connection]
+id=Wired connection 1
+uuid=$(uuid)
+type=ethernet
+autoconnect-priority=-999
+# setting this seems to be counter-productive
+# interface-name=${VIF_GUEST}
+
+[ipv4]
+address1=${GUEST_IP}/${MASKLEN},${GATEWAY}
+#dhcp-hostname=${GUEST_HOSTNAME}
+method=manual
+EOF
+}
+
+##############################
 function setup_lxc() {
 
     set -x
     set -e
     #trap failure ERR INT
 
-    lxc=$1; shift
-    fcdistro=$1; shift
-    pldistro=$1; shift
-    personality=$1; shift
-
-    # create lxc container 
-    copy_configuration
-    if [ $? -ne 0 ]; then
-        echo "failed write configuration file"
-        exit 1
-    fi
+    local lxc=$1; shift
+    local fcdistro=$1; shift
+    local pldistro=$1; shift
+    local personality=$1; shift
+
+    local lxc_root=$(lxcroot $lxc)
+
+    # create lxc container
 
     pkg_method=$(package_method $fcdistro)
     case $pkg_method in
-	yum)
-	    install_fedora || { echo "failed to install fedora"; exit 1 ; }
-	    configure_fedora || { echo "failed to configure fedora for a container"; exit 1 ; }
-	    if [ "$(echo $fcdistro | cut -d"f" -f2)" -le "14" ]; then
-		configure_fedora_init
-	    else
-		configure_fedora_systemd
-	    fi
-	    ;;
-	debootstrap)
-	    echo "$COMMAND: no support for debootstrap-based systems - yet"
-	    exit 1
-	    ;;
-	*)
-	    echo "$COMMAND:: unknown package_method - exiting"
-	    exit 1
-	    ;;
+        dnf)
+            if [ -z "$IMAGE" ]; then
+                fedora_install $lxc ||  { echo "failed to install fedora root image"; exit 1 ; }
+                # this appears to be safer; observed in Jan. 2016 on a f23 host and a f14 cached image
+                # we were getting this message when attempting the first chroot dnf install
+                # rpmdb: Program version 4.8 doesn't match environment version 5.3
+                chroot $(lxcroot $lxc) $personality rm -rf /var/lib/rpm/__db.00{0,1,2,3,4,5,6,7,8,9}
+                chroot $(lxcroot $lxc) $personality rpm --rebuilddb
+            fi
+            fedora_configure $lxc $fcdistro || { echo "failed to configure fedora for a container"; exit 1 ; }
+            ;;
+        debootstrap)
+            if [ -z "$IMAGE" ]; then
+                debian_install $lxc || { echo "failed to install debian/ubuntu root image"; exit 1 ; }
+            fi
+            debian_configure $lxc $fcdistro || { echo "failed to configure debian/ubuntu for a container"; exit 1 ; }
+            ;;
+        *)
+            echo "$COMMAND:: unknown package_method - exiting"
+            exit 1
+            ;;
     esac
 
-    # Enable cgroup
-    mkdir $rootfs_path/cgroup
-    
-    # set up resolv.conf
-    cp /etc/resolv.conf $rootfs_path/etc/resolv.conf
-    # and /etc/hosts for at least localhost
-    [ -f $rootfs_path/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > $rootfs_path/etc/hosts
-    
+    # Enable cgroup -- xxx -- is this really useful ?
+    [ -d $lxc_root/cgroup ] || mkdir $lxc_root/cgroup
+
+    ### set up resolv.conf from host
+    # ubuntu precise and on, /etc/resolv.conf is a symlink to ../run/resolvconf/resolv.conf
+    [ -h $lxc_root/etc/resolv.conf ] && rm -f $lxc_root/etc/resolv.conf
+    ### since fedora36, our hosts use systemd-resolved, but the guests can't use that
+    # so the administrator has the option to create /etc/resolv.conf.containers
+    # and if that file exists it will be copied in the containers instead of /etc/resolv.conf
+    if [ -f /etc/resolv.conf.containers ]; then
+        cp /etc/resolv.conf.containers $lxc_root/etc/resolv.conf
+    else
+        cp /etc/resolv.conf $lxc_root/etc/resolv.conf
+    fi
+    ### and /etc/hosts for at least localhost
+    [ -f $lxc_root/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > $lxc_root/etc/hosts
+
     # grant ssh access from host to guest
-    mkdir $rootfs_path/root/.ssh
-    cat /root/.ssh/id_rsa.pub >> $rootfs_path/root/.ssh/authorized_keys
-    
-    # copy libvirt xml template
-    veth_pair="i$(echo $HOSTNAME | cut -d. -f1)" 
-    tmpl_name="$lxc.xml"
-    cat > $config_path/$tmpl_name<<EOF
+    mkdir -p $lxc_root/root/.ssh
+    cat /root/.ssh/id_rsa.pub >> $lxc_root/root/.ssh/authorized_keys
+    chmod 700 $lxc_root/root/.ssh
+    chmod 600 $lxc_root/root/.ssh/authorized_keys
+
+    # don't keep the input xml, this can be retrieved at all times with virsh dumpxml
+    local config_xml=/tmp/$lxc.xml
+    ( [ -n "$NAT_MODE" ] && write_lxc_xml_natip $lxc || write_lxc_xml_publicip $lxc ) > $config_xml
+
+    # define lxc container for libvirt
+    virsh -c lxc:/// define $config_xml
+
+    return 0
+}
+
+# this part does not belong in a domain any more
+# but goes in a network object of its own existence
+#      <network>
+#        <name>host-bridge</name>
+#        <forward mode="bridge"/>
+#        <bridge name="br0"/>
+#      </network>
+#
+
+function write_lxc_xml_publicip () {
+    local lxc=$1; shift
+    local lxc_root=$(lxcroot $lxc)
+    cat <<EOF
 <domain type='lxc'>
   <name>$lxc</name>
-  <memory>524288</memory>
+  <memory>$MEMORY</memory>
   <os>
     <type arch='$arch2'>exe</type>
     <init>/sbin/init</init>
@@ -636,181 +636,228 @@ function setup_lxc() {
   <devices>
     <emulator>/usr/libexec/libvirt_lxc</emulator>
     <filesystem type='mount'>
-      <source dir='$rootfs_path'/>
+      <source dir='$lxc_root'/>
       <target dir='/'/>
     </filesystem>
     <interface type="bridge">
-      <source bridge="br0"/>
-      <target dev='$veth_pair'/>
+      <source bridge="$PUBLIC_BRIDGE"/>
+      <target dev='$VIF_HOST'/>
     </interface>
     <console type='pty' />
   </devices>
-  <network>
-    <name>host-bridge</name>
-    <forward mode="bridge"/>
-    <bridge name="br0"/>
-  </network>
 </domain>
 EOF
-   
-    # define lxc container for libvirt
-    virsh -c lxc:// define $config_path/$tmpl_name
+}
 
-    # rpm --rebuilddb
-    chroot $rootfs_path /bin/rpm --rebuilddb
+# grant build guests the ability to do mknods
+function write_lxc_xml_natip () {
+    local lxc=$1; shift
+    local lxc_root=$(lxcroot $lxc)
+    cat <<EOF
+<domain type='lxc'>
+  <name>$lxc</name>
+  <memory>$MEMORY</memory>
+  <os>
+    <type arch='$arch2'>exe</type>
+    <init>/sbin/init</init>
+  </os>
+  <features>
+    <acpi/>
+    <capabilities policy='default'>
+      <mknod state='on'/>
+    </capabilities>
+  </features>
+  <vcpu>1</vcpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/libexec/libvirt_lxc</emulator>
+    <filesystem type='mount'>
+      <source dir='$lxc_root'/>
+      <target dir='/'/>
+    </filesystem>
+    <interface type="network">
+      <source network="default"/>
+    </interface>
+    <console type='pty' />
+  </devices>
+</domain>
+EOF
+}
 
-    configure_yum_in_lxc $lxc $fcdistro $pldistro
+# this one is dhcp-based
+function write_guest_ifcfg_natip () {
+    cat <<EOF
+DEVICE=$VIF_GUEST
+BOOTPROTO=dhcp
+ONBOOT=yes
+TYPE=Ethernet
+MTU=1500
+EOF
+}
 
-    return 0
+# use fixed GUEST_IP as specified by GUEST_HOSTNAME
+function write_guest_ifcfg_publicip () {
+    cat <<EOF
+DEVICE=$VIF_GUEST
+BOOTPROTO=static
+ONBOOT=yes
+HOSTNAME=$GUEST_HOSTNAME
+IPADDR=$GUEST_IP
+NETMASK=$NETMASK
+GATEWAY=$GATEWAY
+TYPE=Ethernet
+MTU=1500
+EOF
 }
 
-function devel_or_vtest_tools () {
+function devel_or_test_tools () {
 
-    set -x 
-    set -e 
+    set -x
+    set -e
     trap failure ERR INT
 
-    lxc=$1; shift
-    fcdistro=$1; shift
-    pldistro=$1; shift
-    personality=$1; shift
+    local lxc=$1; shift
+    local fcdistro=$1; shift
+    local pldistro=$1; shift
+    local personality=$1; shift
 
-    pkg_method=$(package_method $fcdistro)
+    local lxc_root=$(lxcroot $lxc)
+
+    local pkg_method=$(package_method $fcdistro)
 
-    pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $PREINSTALLED)
+    local pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $PREINSTALLED)
 
     ### install individual packages, then groups
-    # get target arch - use uname -i here (we want either x86_64 or i386)
-   
-    lxc_arch=$(chroot $rootfs_path /bin/uname -i)
+    # get target arch - (we want either x86_64 or i386)
+
+    local lxc_arch=$(chroot ${lxc_root} $personality arch)
     # on debian systems we get arch through the 'arch' command
-    [ "$lxc_arch" = "unknown" ] && lxc_arch=$(chroot $rootfs_path /bin/arch)
+    [ "$lxc_arch" = "unknown" ] && lxc_arch=$(chroot ${lxc_root} $personality arch)
 
-    packages=$(pl_getPackages -a $lxc_arch $fcdistro $pldistro $pkgsfile)
-    groups=$(pl_getGroups -a $lxc_arch $fcdistro $pldistro $pkgsfile)
+    local packages=$(pl_getPackages -a $lxc_arch $fcdistro $pldistro $pkgsfile)
+    local groups=$(pl_getGroups -a $lxc_arch $fcdistro $pldistro $pkgsfile)
 
     case "$pkg_method" in
-	yum)
-	    [ -n "$packages" ] && chroot $rootfs_path /usr/bin/yum -y install $packages
-	    for group_plus in $groups; do
-		group=$(echo $group_plus | sed -e "s,+++, ,g")
-		chroot $rootfs_path /usr/bin/yum -y groupinstall "$group"
-	    done
-	    # store current rpm list in /init-lxc.rpms in case we need to check the contents
-	    chroot $rootfs_path /bin/rpm -aq > $rootfs_path/init-lxc.rpms
-	    ;;
-	debootstrap)
-	    chroot $rootfs_path /usr/bin/apt-get update
-	    for package in $packages ; do 
-	        chroot $rootfs_path  /usr/bin/apt-get install -y $package 
-	    done
-	    ### xxx todo install groups with apt..
-	    ;;
-	*)
-	    echo "unknown pkg_method $pkg_method"
-	    ;;
+        dnf)
+            # --allowerasing required starting with fedora24
+            #
+            local has_dnf=""
+            chroot ${lxc_root} $personality dnf --version && has_dnf=true
+            if [ -n "$has_dnf" ]; then
+                echo "container has dnf - invoking with --allowerasing"
+                local pkg_installer="dnf -y install --allowerasing"
+                local grp_installer="dnf -y groupinstall --allowerasing"
+            else
+                echo "container has only dnf"
+                local pkg_installer="dnf -y install"
+                local grp_installer="dnf -y groupinstall"
+            fi
+            [ -n "$packages" ] && chroot ${lxc_root} $personality $pkg_installer $packages
+            for group_plus in $groups; do
+                local group=$(echo $group_plus | sed -e "s,+++, ,g")
+                chroot ${lxc_root} $personality $grp_installer "$group"
+            done
+            # store current rpm list in /init-lxc.rpms in case we need to check the contents
+            chroot ${lxc_root} $personality rpm -aq > $lxc_root/init-lxc.rpms
+            ;;
+        debootstrap)
+            # for ubuntu
+            if grep -iq ubuntu /vservers/$lxc/etc/lsb-release 2> /dev/null; then
+                # on ubuntu, at this point we end up with a single feed in /etc/apt/sources.list
+                # we need at least to add the 'universe' feed for python-rpm
+                ( cd /vservers/$lxc/etc/apt ; head -1 sources.list | sed -e s,main,universe, > sources.list.d/universe.list )
+                # also adding a link to updates sounds about right
+                ( cd /vservers/$lxc/etc/apt ; head -1 sources.list | sed -e 's, main,-updates main,' > sources.list.d/updates.list )
+                # tell apt about the changes
+                chroot /vservers/$lxc apt-get update
+            fi
+            for package in $packages ; do
+                # container not started yet
+                #virsh -c lxc:/// lxc-enter-namespace $lxc /usr/bin/$personality /bin/bash -c "apt-get install -y $package" || :
+                chroot ${lxc_root} $personality apt-get install -y $package || :
+            done
+            ### xxx todo install groups with apt..
+            ;;
+        *)
+            echo "unknown pkg_method $pkg_method"
+            ;;
     esac
 
     return 0
 }
 
 function post_install () {
-    lxc=$1; shift 
-    personality=$1; shift
-    if [ -n "$BUILD_MODE" ] ; then
-	post_install_build $lxc $personality
-	start_lxc $lxc
-    else
-	post_install_myplc $lxc $personality
-	start_lxc $lxc
-	wait_for_ssh $lxc
-    fi
+    local lxc=$1; shift
+    local personality=$1; shift
+    local lxc_root=$(lxcroot $lxc)
     # setup localtime from the host
-    cp /etc/localtime $rootfs_path/etc/localtime
+    cp /etc/localtime $lxc_root/etc/localtime
+    sshd_disable_password_auth $lxc
+    # post install hook
+    [ -n "$NAT_MODE" ] && post_install_natip $lxc $personality || post_install_myplc $lxc $personality
+    # start the VM unless specified otherwise
+    if [ -n "$START_VM" ] ; then
+        echo Starting guest $lxc
+        virsh -c lxc:/// start $lxc
+        if [ -n "$NAT_MODE" ] ; then
+            wait_for_ssh $lxc
+        else
+            wait_for_ssh $lxc $GUEST_IP
+        fi
+    fi
 }
 
-function post_install_build () {
+# just in case, let's stay on the safe side
+function sshd_disable_password_auth () {
+    local lxc=$1; shift
+    local lxc_root=$(lxcroot $lxc)
+    sed --in-place=.password -e 's,^#\?PasswordAuthentication.*,PasswordAuthentication no,' \
+        $lxc_root/etc/ssh/sshd_config
+}
+
+function post_install_natip () {
 
-    set -x 
-    set -e 
+    set -x
+    set -e
     trap failure ERR INT
 
-    lxc=$1; shift
-    personality=$1; shift
+    local lxc=$1; shift
+    local personality=$1; shift
+    local lxc_root=$(lxcroot $lxc)
 
 ### From myplc-devel-native.spec
 # be careful to backslash $ in this, otherwise it's the root context that's going to do the evaluation
-    cat << EOF | chroot $rootfs_path /bin/bash -x
-    # set up /dev/loop* in lxc
-    for i in \$(seq 0 255) ; do
-	/bin/mknod -m 640 /dev/loop\$i b 7 \$i
-    done
-    
-    # create symlink for /dev/fd
-    [ ! -e "/dev/fd" ] && /bin/ln -s /proc/self/fd /dev/fd
-
-    # modify /etc/rpm/macros to not use /sbin/new-kernel-pkg
-    /bin/sed -i 's,/sbin/new-kernel-pkg:,,' /etc/rpm/macros
-    if [ -h "/sbin/new-kernel-pkg" ] ; then
-	filename=\$(/bin/readlink -f /sbin/new-kernel-pkg)
-	if [ "\$filename" == "/sbin/true" ] ; then
-		/bin/echo "WARNING: /sbin/new-kernel-pkg symlinked to /sbin/true"
-		/bin/echo "\tmost likely /etc/rpm/macros has /sbin/new-kernel-pkg declared in _netsharedpath."
-		/bin/echo "\tPlease remove /sbin/new-kernel-pkg from _netsharedpath and reintall mkinitrd."
-		exit 1
-	fi
-    fi
-    
+    cat << EOF | chroot ${lxc_root} $personality bash -x
+
     # customize root's prompt
     /bin/cat << PROFILE > /root/.profile
 export PS1="[$lxc] \\w # "
 PROFILE
 
-    uid=2000
-    gid=2000
-    
-    # add a "build" user to the system
-    builduser=\$(grep "^build:" /etc/passwd | wc -l)
-    if [ \$builduser -eq 0 ] ; then
-	groupadd -o -g \$gid build;
-	useradd -o -c 'Automated Build' -u \$uid -g \$gid -n -M -s /bin/bash build;
-    fi
-
-# Allow build user to build certain RPMs as root
-    if [ -f /etc/sudoers ] ; then
-	buildsudo=\$(grep "^build.*ALL=(ALL).*NOPASSWD:.*ALL"  /etc/sudoers | wc -l)
-	if [ \$buildsudo -eq 0 ] ; then
-	    echo "build   ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers
-	fi
-        sed -i 's,^Defaults.*requiretty,#Defaults requiretty,' /etc/sudoers
-    fi
-#
 EOF
-	
+
 }
 
 function post_install_myplc  () {
-    set -x 
-    set -e 
+    set -x
+    set -e
     trap failure ERR INT
 
-    lxc=$1; shift
-    personality=$1; shift
+    local lxc=$1; shift
+    local personality=$1; shift
+    local lxc_root=$(lxcroot $lxc)
 
 # be careful to backslash $ in this, otherwise it's the root context that's going to do the evaluation
-    cat << EOF | chroot $rootfs_path /bin/bash -x
+    cat << EOF | chroot ${lxc_root} $personality bash -x
 
     # create /etc/sysconfig/network if missing
     [ -f /etc/sysconfig/network ] || /bin/echo NETWORKING=yes > /etc/sysconfig/network
 
-    # create symlink for /dev/fd
-    [ ! -e "/dev/fd" ] && /bin/ln -s /proc/self/fd /dev/fd
-
     # turn off regular crond, as plc invokes plc_crond
-    /sbin/chkconfig crond off
-
-    # take care of loginuid in /etc/pam.d 
-    /bin/sed -i "s,#*\(.*loginuid.*\),#\1," /etc/pam.d/*
+    /sbin/chkconfig crond off >& /dev/null
 
     # customize root's prompt
     /bin/cat << PROFILE > /root/.profile
@@ -820,147 +867,211 @@ PROFILE
 EOF
 }
 
-function start_lxc() {
+########################################
+# workaround for broken lxc-enter-namespace
+# 1st version was relying on virsh net-dhcp-leases
+# however this was too fragile, would not work for fedora14 containers
+# WARNING: this code is duplicated in lbuild-nightly.sh
+function guest_ipv4_old() {
+    lxc=$1; shift
 
-    set -x
-    set -e
-    #trap failure ERR INT
+    mac=$(virsh -c lxc:/// domiflist $lxc | grep -E 'network|bridge' | awk '{print $5;}')
+    [ -z "$mac" ] && { echo 1>&2 guest_ipv4_old cannot find mac; return 1; }
+    ip=$(arp -en | grep "$mac" | awk '{print $1;}')
+    # if not known: run a ping and try again
+    if [ -z $ip ]; then
+	    ping -c1 -w1 -W1 $lxc >& /dev/null
+	    ping -c1 -w1 -W1 $lxc.pl.sophia.inria.fr >& /dev/null
+	    ip=$(arp -en | grep "$mac" | awk '{print $1;}')
+    fi
+    [ -z "$ip" ] && { echo 1>&2 guest_ipv4_old cannot find ip; return 1; }
+    echo $ip
+}
 
+function guest_ipv4() {
     lxc=$1; shift
-  
-    virsh -c lxc:// start $lxc
-  
-    return 0
+
+    # this gives us the libvirt_lxc pid for the container
+    local lxc_pid=$(virsh -c lxc:/// dominfo $lxc | grep '^Id:' | awk '{print $2;}' | sed -e "s|-||g")
+    [[ -z "$lxc_pid" ]] && { echo 1>&2 guest_ipv4 cannot find lxc pid; return 1; }
+    # but we need the systemd (pid=1) instance for the container
+    local systemd_pid=$(pgrep -P $lxc_pid systemd)
+    [[ -z "$systemd_pid" ]] && { echo 1>&2 guest_ipv4 cannot systemd pid; return 1; }
+    # from there we can inspect the network interfaces
+    local domip=$(nsenter -t $systemd_pid -n ip -br addr show eth0 \
+                 | awk '{print $3}' \
+                 | cut -d/ -f1 \
+                 )
+    [ -z "$domip" ] && { echo 1>&2 guest_ipv4 cannot find ip; return 1; }
+    echo $domip
 }
 
 function wait_for_ssh () {
     set -x
     set -e
-    #trap failure ERR INT
 
-    lxc=$1; shift
-  
-    echo $IP is up, waiting for ssh...
-
-    #wait max 5 min for sshd to start 
-    ssh_up=""
-    stop_time=$(($(date +%s) + 300))
-    current_time=$(date +%s)
-    
-    counter=1
+    local lxc=$1; shift
+
+    # if run in public_ip mode, we know the IP of the guest and it is specified here
+    local specified_ip
+    [ -n "$1" ] && { specified_ip=$1; shift; }
+
+    #wait max 2 min for sshd to start
+    local success=""
+    local current_time=$(date +%s)
+    local stop_time=$(($current_time + 120))
+
+    local counter=1
     while [ "$current_time" -lt "$stop_time" ] ; do
-         echo "$counter-th attempt to reach sshd in container $lxc ..."
-         ssh -o "StrictHostKeyChecking no" $IP 'uname -i' && { ssh_up=true; echo "SSHD in container $lxc is UP"; break ; } || :
-         sleep 10
-         current_time=$(($current_time + 10))
-         counter=$(($counter+1))
+        if [ -n "$specified_ip" ]; then
+            guest_ip="${specified_ip}"
+        else
+            guest_ip=$(guest_ipv4 $lxc) || :
+        fi
+        echo "$counter-th attempt to reach sshd in container $lxc on address $guest_ip ..."
+        [ -n "$guest_ip" ] && ssh -o "StrictHostKeyChecking no" $guest_ip arch && {
+            success=true; echo "SSHD in container $lxc is UP on IP $guest_ip"; break ; } || :
+        # some of our boxes have gone through a long upgrade historically, and
+        # so they don't end up with the same gid mapping for the ssh_keys
+        # group as the ones in the guest that result from a fresh install
+        # 2024 : lxc-enter-namespace is broken anyways
+        # virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "chown root:ssh_keys /etc/ssh/*_key" || :
+        counter=$(($counter+1))
+        sleep 10
+        current_time=$(date +%s)
     done
 
     # Thierry: this is fatal, let's just exit with a failure here
-    [ -z $ssh_up ] && { echo "SSHD in container $lxc is not running" ; exit 1 ; } 
+    [ -z $success ] && { echo "SSHD in container $lxc could not be reached (guest_ip=$guest_ip)" ; exit 1 ; }
     return 0
 }
 
+####################
+function failure () {
+    echo "$COMMAND : Bailing out"
+    exit 1
+}
+
 function usage () {
-    set +x 
-    echo "Usage: $COMMAND_LBUILD [options] lxc-name"
-    echo "Usage: $COMMAND_LTEST [options] lxc-name repo-url [ -- lxc-options ]"
+    set +x
+    echo "Usage: $COMMAND [options] lxc-name             (aka build mode)"
+    echo "Usage: $COMMAND -n hostname [options] lxc-name (aka test mode)"
     echo "Description:"
-    echo "   This command creates a fresh lxc instance, for building, or running, myplc"
+    echo "    This command creates a fresh lxc instance, for building, or running a test myplc"
+    echo "In its first form, spawned VM gets a private IP bridged with virbr0 over dhcp/nat"
+    echo "With the second form, spawned VM gets a public IP bridged on public bridge br0"
+    echo ""
     echo "Supported options"
+    echo " -n hostname - the hostname to use in container"
     echo " -f fcdistro - for creating the root filesystem - defaults to $DEFAULT_FCDISTRO"
-    echo " -d pldistro - defaults to $DEFAULT_PLDISTRO"
+    echo " -d pldistro - defaults to $DEFAULT_PLDISTRO - current support for fedoras debians ubuntus"
     echo " -p personality - defaults to $DEFAULT_PERSONALITY"
-    echo " -i ifname: determines ip and netmask attached to ifname, and passes it to the lxc"
-    echo "-- lxc-options"
-    echo "  --netdev : interface to be defined inside lxc"
-    echo "  --interface : IP to be defined for the lxc"
-    echo "  --hostname : Hostname to be defined for the lxc"
-    echo "With $COMMAND_LTEST you can give 'none' as the URL, in which case"
-    echo "   myplc.repo does not get created"
+    echo " -r repo-url - used to populate yum.repos.d - required in test mode"
+    echo " -P pkgs_file - defines a set of extra packages to install in guest"
+    echo "    by default we use devel.pkgs (build mode) or runtime.pkgs (test mode)"
+    echo " -i image - the location of the rootfs"
+    echo " -m memory - the amount of allocated memory in MB - defaults to $DEFAULT_MEMORY MB"
+    echo " -s do not start VM"
+    echo " -v be verbose"
     exit 1
 }
 
-### parse args and 
+### parse args and
 function main () {
 
     #set -e
     #trap failure ERR INT
 
-    case "$COMMAND" in
-	$COMMAND_LBUILD)
-	    BUILD_MODE=true ;;
-	$COMMAND_LTEST)
-	    TEST_MODE=true;;
-	*)
-	    usage ;;
-    esac
-
-    VERBOSE=
-    RESISTANT=""
-    IFNAME=""
-    LXC_OPTIONS=""
-
-    # the set of preinstalled packages - depends on vbuild or vtest
-    if [ -n "$VBUILD_MODE" ] ; then
-	PREINSTALLED=devel.pkgs
-    else
-	PREINSTALLED=vtest.pkgs
+    if [ "$(id -u)" != "0" ]; then
+          echo "This script should be run as 'root'"
+          exit 1
     fi
-    while getopts "f:d:p:P:i:" opt ; do
-	case $opt in
-	    f) fcdistro=$OPTARG;;
-	    d) pldistro=$OPTARG;;
-	    p) personality=$OPTARG;;
-	    P) PREINSTALLED=$OPTARG;;
-	    i) IFNAME=$OPTARG;;
-	    *) usage ;;
-	esac
+
+    START_VM=true
+    while getopts "n:f:d:p:r:uP:i:m:sv" opt ; do
+        case $opt in
+            n) GUEST_HOSTNAME=$OPTARG;;
+            f) fcdistro=$OPTARG;;
+            d) pldistro=$OPTARG;;
+            p) personality=$OPTARG;;
+            r) MYPLC_REPO_URL=$OPTARG;;
+            u) USE_UPSTREAM_REPOS=true;;
+            P) PREINSTALLED=$OPTARG;;
+            i) IMAGE=$OPTARG;;
+            m) MEMORY=$OPTARG;;
+            s) START_VM= ;;
+            v) VERBOSE=true; set -x;;
+            *) usage ;;
+        esac
     done
-	
+
     shift $(($OPTIND - 1))
 
     # parse fixed arguments
     [[ -z "$@" ]] && usage
-    lxc=$1 ; shift
-    if [ -n "$TEST_MODE" ] ; then
-	[[ -z "$@" ]] && usage
-	REPO_URL=$1 ; shift
+    local lxc=$1 ; shift
+    local lxc_root=$(lxcroot $lxc)
+
+    # rainchecks
+    # when using with the -i option, checking that $lxc_root is void
+    # is a little too much stress..
+    almost_empty $lxc_root || \
+        { echo "container $lxc already exists in $lxc_root - exiting" ; exit 1 ; }
+    virsh -c lxc:/// domuuid $lxc >& /dev/null && \
+        { echo "container $lxc already exists in libvirt - exiting" ; exit 1 ; }
+    mkdir -p $lxc_root
+
+    # if IMAGE, copy the provided rootfs to lxc_root
+    if [ -n "$IMAGE" ] ; then
+        if [ ! -d "$IMAGE" ]; then
+            echo "$IMAGE rootfs folder does not exist - exiting"
+            exit 1
+        else
+            echo "Copying $IMAGE into $lxc_root with rsync --archive --delete"
+            rsync --archive --delete $IMAGE/ $lxc_root/
+        fi
     fi
 
-    # parse vserver options
-    if [[ -n "$@" ]] ; then
-	if [ "$1" == "--" ] ; then
-	    shift
-	    LXC_OPTIONS="$@"
-	else
-	    usage
-	fi
-    fi
+    # check we've exhausted the arguments
+    [[ -n "$@" ]] && usage
 
-    eval set -- "$LXC_OPTIONS"
-
-    while true
-     do
-        case "$1" in
-             --netdev)      IFNAME=$2; shift 2;;
-             --interface)   IP=$2; shift 2;;
-             --hostname)    HOSTNAME=$2; shift 2;;
-             *)             break ;;
-        esac
-      done
-
-   
-    if [ -n "$BUILD_MODE" ] ; then
-	[ -z "$IFNAME" ] && IFNAME=$DEFAULT_IFNAME
-        [ -z "$HOSTNAME" ] && HOSTNAME=$lxc
-    fi
+    # NAT_MODE is true unless we specified a hostname
+    [ -n "$GUEST_HOSTNAME" ] || NAT_MODE=true
 
+    # set default values
     [ -z "$fcdistro" ] && fcdistro=$DEFAULT_FCDISTRO
     [ -z "$pldistro" ] && pldistro=$DEFAULT_PLDISTRO
     [ -z "$personality" ] && personality=$DEFAULT_PERSONALITY
-    
-    release=$(echo $fcdistro | cut -df -f2)
+    [ -z "$MEMORY" ] && MEMORY=$DEFAULT_MEMORY
+
+    # set memory in KB
+    MEMORY=$(($MEMORY * 1024))
+
+    # the set of preinstalled packages - depends on mode
+    if [ -z "$PREINSTALLED" ] ; then
+        if [ -n "$NAT_MODE" ] ; then
+            PREINSTALLED=devel.pkgs
+        else
+            PREINSTALLED=runtime.pkgs
+        fi
+    fi
+
+    if [ -n "$NAT_MODE" ] ; then
+        # we can now set GUEST_HOSTNAME safely
+        [ -z "$GUEST_HOSTNAME" ] && GUEST_HOSTNAME=$(echo $lxc | sed -e 's,\.,-,g')
+    else
+        # as this command can be used in other contexts, not specifying
+        # a repo is considered a warning
+        # use -r none to get rid of this warning
+        if [ "$MYPLC_REPO_URL" == "none" ] ; then
+            MYPLC_REPO_URL=""
+        elif [ -z "$MYPLC_REPO_URL" ] ; then
+            echo "WARNING -- setting up a yum repo is recommended"
+        fi
+    fi
+
+    ##########
+    fedora_release=$(echo $fcdistro | cut -df -f2)
 
     if [ "$personality" == "linux32" ]; then
         arch=i386
@@ -972,64 +1083,33 @@ function main () {
         echo "Unknown personality: $personality"
     fi
 
-    # need lxc installed before we can run lxc-ls
-    # need bridge installed
-    prepare_host    
-
-    if [ -n "$BUILD_MODE" ] ; then
-
-	# Bridge IP affectation
-	x=$(echo $personality | cut -dx -f2)
-	y=$(echo $fcdistro | cut -df -f2)
-	z=$(($x + $y))
-
-        IP="192.168.122.$z"
-        NETMASK="255.255.255.0"
-        GATEWAY="192.168.122.1"
-	
-        lxc_network_type=veth
-        lxc_network_link=virbr0
-	veth_pair="veth$z"
-        echo "the IP address of container $lxc is $IP "
-    else
-        [[ -z "$REPO_URL" ]] && usage
-        [[ -z "$IP" ]] && usage
-       
-        NETMASK=$(ifconfig br0 | grep 'inet ' | awk '{print $4}' | sed -e 's/.*://')
-        GATEWAY=$(route -n | grep 'UG' | awk '{print $2}')
-        [[ -z "$HOSTNAME" ]] && usage
-        lxc_network_type=veth
-        lxc_network_link=br0
-        veth_pair="i$(echo $HOSTNAME | cut -d. -f1)"
-    fi
+    # compute networking details for the test mode
+    # (build mode relies entirely on dhcp on the private subnet)
+    if [ -z "$NAT_MODE" ] ; then
 
-    CIDR=$(cidr_notation $NETMASK)
-    
+        #create_bridge_if_needed $PUBLIC_BRIDGE
+        lbuild-bridge.sh $PUBLIC_BRIDGE
 
-    if [ "$(id -u)" != "0" ]; then
-          echo "This script should be run as 'root'"
-          exit 1
+        GUEST_IP=$(gethostbyname $GUEST_HOSTNAME)
+        # use same NETMASK as bridge interface br0
+        MASKLEN=$(ip addr show $PUBLIC_BRIDGE | grep -v inet6 | grep inet | awk '{print $2;}' | cut -d/ -f2)
+        NETMASK=$(masklen_to_netmask $MASKLEN)
+        GATEWAY=$(ip route show | grep default | awk '{print $3}' | head -1)
+        VIF_HOST="vif$(echo $GUEST_HOSTNAME | cut -d. -f1)"
     fi
 
-    path=/vservers
-    [ ! -d $path ] && mkdir $path
-    rootfs_path=$path/$lxc/rootfs
-    config_path=$path/$lxc
-    cache_base=/var/cache/lxc/fedora/$arch
-    cache=$cache_base/$release
-    root_password=root
-    
-    # check whether the rootfs directory is created to know if the container exists
-    # bacause /var/lib/lxc/$lxc is already created while putting $lxc.timestamp
-    [ -d $rootfs_path ] && { echo "container $lxc already exists - exiting" ; exit 1 ; }
-
-    setup_lxc $lxc $fcdistro $pldistro $personality 
+    setup_lxc $lxc $fcdistro $pldistro $personality
 
-    devel_or_vtest_tools $lxc $fcdistro $pldistro $personality
+    # historically this command is for setting up a build or a test VM
+    # kind of patchy right now though
+    devel_or_test_tools $lxc $fcdistro $pldistro $personality
 
+    # container gets started here
     post_install $lxc $personality
-    
+
     echo $COMMAND Done
+
+    exit 0
 }
 
 main "$@"