X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=5f51503a183c19cb04be937b2bcfa6e59e56cb30;hb=b4dcf590f6c1aaaf3f4d508dfa207ed5fed6851e;hp=10f4235d07ff2933d97f4866425a0431e7642efd;hpb=1246592fb46c89a27f42f1986226af8f7b617ae7;p=build.git

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 10f4235d..5f51503a 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -1,81 +1,41 @@
 #!/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
+# pkgs parsing utilities + lbuild-bridge.sh
+export PATH=$(dirname $0):$PATH
+
+# 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
+
 . build.common
 
 DEFAULT_FCDISTRO=f20
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
-
-COMMAND_LBUILD="lbuild-initvm.sh"
-COMMAND_LTEST="ltest-initvm.sh"
+DEFAULT_MEMORY=512
 
 ##########
-# when creating build boxes we use private NAT'ed addresses for the VMs
-# as per virbr0 that is taken care of by libvirt at startup
-PRIVATE_PREFIX="192.168.122."
-PRIVATE_GATEWAY="192.168.122.1"
-# beware that changing this would break the logic of random_private_byte...
-PRIVATE_MASKLEN=24
-
-# we just try randomly in that range until a free IP address shows up
-PRIVATE_ATTEMPTS=20
-
 # constant
-INTERFACE_BRIDGE=br0
+PUBLIC_BRIDGE=br0
 
 # the network interface name as seen from the container
-VIFNAME=eth0
+VIF_GUEST=eth0
 
-##############################
-## stolen from tests/system/template-qemu/qemu-bridge-init
-# 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
-}
-########## check for a free IP
-function ip_is_busy () {
-    target=$1; shift
-    ping -c 1 -W 1 $target >& /dev/null
-}
-
-function random_private_byte () {
-    for attempt in $(seq $PRIVATE_ATTEMPTS); do
-	byte=$(($RANDOM % 256))
-	if [ "$byte" == 0 -o "$byte" == 1 ] ; then continue; fi
-	ip=${PRIVATE_PREFIX}${byte}
-	ip_is_busy $ip || { echo $byte; return; }
-    done
-    echo "Cannot seem to find a free IP address in range ${PRIVATE_PREFIX}.xx/24 after $PRIVATE_ATTEMPTS attempts - exiting"
-    exit 1
-}
+##########
+FEDORA_PREINSTALLED="yum initscripts passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients"
+DEBIAN_PREINSTALLED="openssh-server openssh-client"
 
-########## networking -- ctd
+########## networking utilities
 function gethostbyname () {
     hostname=$1
     python -c "import socket; print socket.gethostbyname('"$hostname"')" 2> /dev/null
@@ -103,206 +63,75 @@ print ".".join([ str(256-2**(8-i)) for i in result ])
 EOF
 }
 
-#################### bridge initialization
-function create_bridge_if_needed() {
-   
-    # turn on verbosity
-    set -x
-
-    # already created ? - we're done
-    ip addr show $INTERFACE_BRIDGE >& /dev/null && {
-	echo "Bridge already set up - skipping create_bridge_if_needed"
-	return 0
-    }
-
-    # find out the physical interface to bridge onto
-    if_lan=$(discover_interface)
-
-    ip addr show $if_lan &>/dev/null || {
-        echo "Cannot use interface $if_lan - exiting"
-        exit 1
-    }
-
-    #################### bride initialization
-    check_yum_installed bridge-utils
-
-    echo "========== $COMMAND: entering create_bridge - beg"
-    hostname
-    uname -a
-    ip addr show
-    ip route
-    echo "========== $COMMAND: entering create_bridge - end"
-
-    # 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
-
-    
-    #Getting host IP/masklen
-    address=$(ip addr show $if_lan | grep -v inet6 | grep inet | head --lines=1 | awk '{print $2;}')
-    [ -z "$address" ] && { echo "ERROR: Could not determine IP address for $if_lan" ; exit 1 ; }
-
-    broadcast=$(ip addr show $if_lan | grep -v inet6 | grep inet | head --lines=1 | awk '{print $4;}')
-    [ -z "$broadcast" ] && echo "WARNING: Could not determine broadcast address for $if_lan"
-
-    gateway=$(ip route show | grep default | awk '{print $3;}')
-    [ -z "$gateway" ] && echo "WARNING: Could not determine gateway IP"
-
-
-    # creating the bridge
-    echo "Creating bridge INTERFACE_BRIDGE=$INTERFACE_BRIDGE"
-    brctl addbr $INTERFACE_BRIDGE
-    brctl addif $INTERFACE_BRIDGE $if_lan
-    echo "Activating promiscuous mode if_lan=$if_lan"
-    ip link set $if_lan up promisc on
-    sleep 2
-    # rely on dhcp to re assign IP.. 
-    echo "Starting dhclient on $INTERFACE_BRIDGE"
-    dhclient $INTERFACE_BRIDGE
-    sleep 1
-
-    #Reconfigure the routing table
-    echo "Configuring gateway=$gateway"
-    ip route add default via $gateway dev $INTERFACE_BRIDGE
-    ip route del default via $gateway dev $if_lan
-    # at this point we have an extra route like e.g.
-    ## ip route show
-    #default via 138.96.112.250 dev br0
-    #138.96.112.0/21 dev em1  proto kernel  scope link  src 138.96.112.57
-    #138.96.112.0/21 dev br0  proto kernel  scope link  src 138.96.112.57
-    #192.168.122.0/24 dev virbr0  proto kernel  scope link  src 192.168.122.1
-    route_dest=$(ip route show | grep -v default | grep "dev $INTERFACE_BRIDGE" | awk '{print $1;}')
-    ip route del $route_dest dev $if_lan
-
-    echo "========== $COMMAND: exiting create_bridge - beg"
-    ip addr show
-    ip route show
-    echo "========== $COMMAND: exiting create_bridge - end"
-
-    # for safety
-    sleep 3
-    return 0
-
+##############################
+# return yum or debootstrap
+function package_method () {
+    fcdistro=$1; shift
+    case $fcdistro in
+	f[0-9]*|centos[0-9]*|sl[0-9]*) echo yum ;;
+	squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy) echo debootstrap ;;
+	*) echo Unknown distro $fcdistro ;;
+    esac 
 }
 
-
-##############################
-function check_yum_installed () {
-    package=$1; shift
-    rpm -q $package >& /dev/null || yum -y install $package
+# 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 ;;
+    esac
 }
 
-function check_yumgroup_installed () {
-    group="$1"; shift
-    yum grouplist "$group" | grep -q Installed || { yum -y groupinstall "$group" ; }
+# 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 fedora_install() {
+    set -x
+    set -e
 
-function configure_fedora() {
-
-    # disable selinux in fedora
-    mkdir -p $rootfs_path/selinux
-    echo 0 > $rootfs_path/selinux/enforce
-
-   # configure the network 
-
-    cat <<EOF > ${rootfs_path}/etc/sysconfig/network-scripts/ifcfg-$VIFNAME
-DEVICE=$VIFNAME
-BOOTPROTO=static
-ONBOOT=yes
-HOSTNAME=$HOSTNAME
-IPADDR=$IP
-NETMASK=$NETMASK
-GATEWAY=$GATEWAY
-NM_CONTROLLED=no
-TYPE=Ethernet
-MTU=1500
-EOF
-
-    # 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
-
-    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
-
-    #echo "setting root passwd to $root_password"
-    #echo "root:$root_password" | chroot $rootfs_path chpasswd
+    cache=/var/cache/lxc/fedora/$arch/$release
+    
+    mkdir -p /var/lock/subsys/
+    (
+        flock -n -x 200 || { echo "Cache repository is busy." ; return 1 ; }
 
-    return 0
-}
+        if [ ! -e "$cache/rootfs" ]; then
+            echo "Getting cache download in $cache/rootfs ... "
+            fedora_download || { echo "Failed to download 'fedora base'"; return 1; }
+        else
+            echo "Updating cache $cache/rootfs ..."
+	    if ! yum --installroot $cache/rootfs -y --nogpgcheck update ; then
+                echo "Failed to update 'fedora base', continuing with last known good cache"
+            else
+                echo "Update finished"
+            fi
+        fi
 
-function configure_fedora_init() {
+        echo "Copy $cache/rootfs to $lxc_root ... "
+	rsync -a $cache/rootfs/ $lxc_root/
+	
+        return 0
 
-    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
-}
+        ) 200>/var/lock/subsys/lxc
 
-# 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
+    return $?
 }
 
-function download_fedora() {
-set -x
+function fedora_download() {
+    set -x
     # check the mini fedora was not already downloaded
     INSTALL_ROOT=$cache/partial
     echo $INSTALL_ROOT
@@ -310,11 +139,7 @@ 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/dev
@@ -326,8 +151,7 @@ set -x
     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
+    for f in $INSTALL_ROOT/etc/yum.repos.d/* ; do
       sed -i "s/\$basearch/$arch/g; s/\$releasever/$release/g;" $f
     done 
 
@@ -363,14 +187,8 @@ set -x
     # 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
+    echo "$YUM install $FEDORA_PREINSTALLED"
+    $YUM install $FEDORA_PREINSTALLED || { echo "Failed to download rootfs, aborting." ; return 1; }
 
     mv "$INSTALL_ROOT" "$cache/rootfs"
     echo "Download complete."
@@ -378,69 +196,106 @@ 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
-}
+    set -x
+    set -e
 
+    # disable selinux in fedora
+    mkdir -p $lxc_root/selinux
+    echo 0 > $lxc_root/selinux/enforce
 
-function install_fedora() {
-    set -x
+    # set the hostname
+    case "$fcdistro" in 
+	f18|f2?)
+	    cat <<EOF > ${lxc_root}/etc/hostname
+$GUEST_HOSTNAME
+EOF
+	    echo ;;
+	*)
+            cat <<EOF > ${lxc_root}/etc/sysconfig/network
+NETWORKING=yes
+HOSTNAME=$GUEST_HOSTNAME
+EOF
+            # set minimal hosts
+	    cat <<EOF > $lxc_root/etc/hosts
+127.0.0.1 localhost $GUEST_HOSTNAME
+EOF
+	    echo ;;
+    esac
 
-    mkdir -p /var/lock/subsys/
-    (
-        flock -n -x 200
-        if [ $? -ne 0 ]; then
-            echo "Cache repository is busy."
-            return 1
-        fi
+    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
 
-        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
+    if [ "$(echo $fcdistro | cut -d"f" -f2)" -le "14" ]; then
+	fedora_configure_init
+    else
+	fedora_configure_systemd
+    fi
 
-        echo "Copy $cache/rootfs to $rootfs_path ... "
-        copy_fedora
-        if [ $? -ne 0 ]; then
-            echo "Failed to copy rootfs"
-            return 1
-        fi
+    guest_ifcfg=${lxc_root}/etc/sysconfig/network-scripts/ifcfg-$VIF_GUEST
+    ( [ -n "$BUILD_MODE" ] && write_guest_ifcfg_build || write_guest_ifcfg_test ) > $guest_ifcfg
 
-        return 0
+    [ -z "$IMAGE" ] && fedora_configure_yum $lxc $fcdistro $pldistro
 
-        ) 200>/var/lock/subsys/lxc
+    return 0
+}
 
-    return $?
+function fedora_configure_init() {
+    set -e
+    set -x
+    sed -i 's|.sbin.start_udev||' ${lxc_root}/etc/rc.sysinit
+    sed -i 's|.sbin.start_udev||' ${lxc_root}/etc/rc.d/rc.sysinit
+    # don't mount devpts, for pete's sake
+    sed -i 's/^.*dev.pts.*$/#\0/' ${lxc_root}/etc/rc.sysinit
+    sed -i 's/^.*dev.pts.*$/#\0/' ${lxc_root}/etc/rc.d/rc.sysinit
+    chroot ${lxc_root} chkconfig udev-post off
+    chroot ${lxc_root} chkconfig network on
 }
 
+# this code of course is for guests that do run on systemd
+function fedora_configure_systemd() {
+    set -e
+    set -x
+    # 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
+# 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=/' ${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 || :
+# can't seem to handle this one with systemctl
+    chroot ${lxc_root} chkconfig network on
+}
 
-# overwrite lxc's internal yum config
-function configure_yum_in_lxc () {
+# overwrite container yum config
+function fedora_configure_yum () {
     set -x 
     set -e 
     trap failure ERR INT
@@ -449,10 +304,13 @@ function configure_yum_in_lxc () {
     fcdistro=$1; shift
     pldistro=$1; shift
 
+    # rpm --rebuilddb
+    chroot $lxc_root rpm --rebuilddb
+
     echo "Initializing yum.repos.d in $lxc"
-    rm -f $rootfs_path/etc/yum.repos.d/*
+    rm -f $lxc_root/etc/yum.repos.d/*
 
-    cat > $rootfs_path/etc/yum.repos.d/building.repo <<EOF
+    cat > $lxc_root/etc/yum.repos.d/building.repo <<EOF
 [fedora]
 name=Fedora $release - $arch
 baseurl=http://mirror.onelab.eu/fedora/releases/$release/Everything/$arch/os/
@@ -473,16 +331,16 @@ EOF
     # for using vtest-init-lxc.sh as a general-purpose lxc creation wrapper
     # just mention 'none' as the repo url
     if [ -n "$REPO_URL" ] ; then
-	if [ ! -d $rootfs_path/etc/yum.repos.d ] ; 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 $rootfs_path/etc/yum.repos.d/* ; do
+	    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 > $rootfs_path/etc/yum.repos.d/myplc.repo <<EOF
+	    cat > $lxc_root/etc/yum.repos.d/myplc.repo <<EOF
 [myplc]
 name= MyPLC
 baseurl=$REPO_URL
@@ -493,39 +351,62 @@ EOF
     fi
 }    
 
-# return yum or debootstrap
-function package_method () {
+##############################
+# need to specify the right mirror for debian variants like ubuntu and the like
+function debian_mirror () {
     fcdistro=$1; shift
     case $fcdistro in
-	f[0-9]*|centos[0-9]*|sl[0-9]*) echo yum ;;
-	squeeze|wheezy|oneiric|precise|quantal|raring|saucy) echo debootstrap ;;
-	*) echo Unknown distro $fcdistro ;;
-    esac 
+	squeeze|wheezy|jessie) 
+	    echo http://ftp2.fr.debian.org/debian/ ;;
+	oneiric|precise|quantal|raring|saucy) 
+	    echo http://mir1.ovh.net/ubuntu/ubuntu/ ;;
+	*) 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 ;;
-    esac
+function debian_install () {
+    set -e
+    set -x
+    lxc=$1; shift
+    mkdir -p $lxc_root
+    arch=$(canonical_arch $personality $fcdistro)
+    mirror=$(debian_mirror $fcdistro)
+    debootstrap --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 /bin/bash -c "apt-get update"
+    #virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "apt-get -y install $DEBIAN_PREINSTALLED"
+    chroot $lxc_root apt-get update
+    chroot $lxc_root apt-get -y install $DEBIAN_PREINSTALLED
+    # configure hostname
+    cat <<EOF > ${lxc_root}/etc/hostname
+$GUEST_HOSTNAME
+EOF
+    
 }
 
-# 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 debian_configure () {
+    guest_interfaces=${lxc_root}/etc/network/interfaces
+    ( [ -n "$BUILD_MODE" ] && write_guest_interfaces_build || write_guest_interfaces_test ) > $guest_interfaces
+}
+
+function write_guest_interfaces_build () {
+    cat <<EOF
+auto $VIF_GUEST
+iface $VIF_GUEST inet dhcp
+EOF
 }
 
+function write_guest_interfaces_test () {
+    cat <<EOF
+auto $VIF_GUEST
+iface $VIF_GUEST inet static
+address $GUEST_IP
+netmask $NETMASK
+gateway $GATEWAY
+EOF
+}
+##############################
 function setup_lxc() {
 
     set -x
@@ -542,17 +423,16 @@ function setup_lxc() {
     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
+            if [ -z "$IMAGE" ]; then
+                fedora_install ||  { echo "failed to install fedora root image"; exit 1 ; }
+            fi
+	    fedora_configure || { echo "failed to configure fedora for a container"; exit 1 ; }
 	    ;;
 	debootstrap)
-	    echo "$COMMAND: no support for debootstrap-based systems - yet"
-	    exit 1
+            if [ -z "$IMAGE" ]; then
+	        debian_install $lxc || { echo "failed to install debian/ubuntu root image"; exit 1 ; }
+            fi
+	    debian_configure || { echo "failed to configure debian/ubuntu for a container"; exit 1 ; }
 	    ;;
 	*)
 	    echo "$COMMAND:: unknown package_method - exiting"
@@ -560,25 +440,36 @@ function setup_lxc() {
 	    ;;
     esac
 
-    # Enable cgroup
-    mkdir $rootfs_path/cgroup
+    # Enable cgroup -- xxx -- is this really useful ?
+    mkdir $lxc_root/cgroup
     
     # set up resolv.conf
-    cp /etc/resolv.conf $rootfs_path/etc/resolv.conf
+    cp /etc/resolv.conf $lxc_root/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
+    [ -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
+    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
+    config_xml=/tmp/$lxc.xml
+    ( [ -n "$BUILD_MODE" ] && write_lxc_xml_build $lxc || write_lxc_xml_test $lxc ) > $config_xml
     
-    # copy libvirt xml template
-    veth_pair="i$(echo $HOSTNAME | cut -d. -f1)" 
-    tmpl_name="$lxc.xml"
-    cat > $config_path/$tmpl_name<<EOF
+    # define lxc container for libvirt
+    virsh -c lxc:/// define $config_xml
+
+    return 0
+}
+
+function write_lxc_xml_test () {
+    lxc=$1; shift
+    cat <<EOF
 <domain type='lxc'>
   <name>$lxc</name>
-  <memory>524288</memory>
+  <memory>$MEMORY</memory>
   <os>
     <type arch='$arch2'>exe</type>
     <init>/sbin/init</init>
@@ -594,32 +485,83 @@ 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="$INTERFACE_BRIDGE"/>
-      <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="$INTERFACE_BRIDGE"/>
+    <bridge name="$PUBLIC_BRIDGE"/>
   </network>
 </domain>
 EOF
+}
 
-    # define lxc container for libvirt
-    virsh -c lxc:// define $config_path/$tmpl_name
-
-    # rpm --rebuilddb
-    chroot $rootfs_path /bin/rpm --rebuilddb
+function write_lxc_xml_build () { 
+    lxc=$1; shift
+    cat <<EOF
+<domain type='lxc'>
+  <name>$lxc</name>
+  <memory>$MEMORY</memory>
+  <os>
+    <type arch='$arch2'>exe</type>
+    <init>/sbin/init</init>
+  </os>
+  <features>
+    <acpi/>
+  </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_build () {
+    cat <<EOF
+DEVICE=$VIF_GUEST
+BOOTPROTO=dhcp
+ONBOOT=yes
+NM_CONTROLLED=no
+TYPE=Ethernet
+MTU=1500
+EOF
+}
 
-    return 0
+# use fixed GUEST_IP as specified by GUEST_HOSTNAME
+function write_guest_ifcfg_test () {
+    cat <<EOF
+DEVICE=$VIF_GUEST
+BOOTPROTO=static
+ONBOOT=yes
+HOSTNAME=$GUEST_HOSTNAME
+IPADDR=$GUEST_IP
+NETMASK=$NETMASK
+GATEWAY=$GATEWAY
+NM_CONTROLLED=no
+TYPE=Ethernet
+MTU=1500
+EOF
 }
 
 function devel_or_vtest_tools () {
@@ -640,27 +582,38 @@ function devel_or_vtest_tools () {
     ### 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)
+    lxc_arch=$(chroot $lxc_root uname -i)
     # 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 arch)
 
     packages=$(pl_getPackages -a $lxc_arch $fcdistro $pldistro $pkgsfile)
     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
+	    [ -n "$packages" ] && chroot $lxc_root 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"
+		chroot $lxc_root 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
+	    chroot $lxc_root rpm -aq > $lxc_root/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 
+	    # 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 /bin/bash -c "apt-get install -y $package" || :
+		chroot $lxc_root apt-get install -y $package || :
 	    done
 	    ### xxx todo install groups with apt..
 	    ;;
@@ -677,14 +630,19 @@ function post_install () {
     personality=$1; shift
     if [ -n "$BUILD_MODE" ] ; then
 	post_install_build $lxc $personality
-	start_lxc $lxc
+	virsh -c lxc:/// start $lxc
+	# manually run dhclient in guest - somehow this network won't start on its own
+	virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "dhclient $VIF_GUEST"
     else
 	post_install_myplc $lxc $personality
-	start_lxc $lxc
+	virsh -c lxc:/// start $lxc
+# it sounds like we don't need ssh per se any more
+# it still makes sense to wait for network readiness though
+# some day maybe...
 	wait_for_ssh $lxc
     fi
     # setup localtime from the host
-    cp /etc/localtime $rootfs_path/etc/localtime
+    cp /etc/localtime $lxc_root/etc/localtime
 }
 
 function post_install_build () {
@@ -698,51 +656,13 @@ function post_install_build () {
 
 ### 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 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
 	
 }
@@ -756,20 +676,14 @@ function post_install_myplc  () {
     personality=$1; shift
 
 # 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 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/*
-
     # customize root's prompt
     /bin/cat << PROFILE > /root/.profile
 export PS1="[$lxc] \\w # "
@@ -778,19 +692,6 @@ PROFILE
 EOF
 }
 
-function start_lxc() {
-
-    set -x
-    set -e
-    #trap failure ERR INT
-
-    lxc=$1; shift
-  
-    virsh -c lxc:// start $lxc
-  
-    return 0
-}
-
 function wait_for_ssh () {
     set -x
     set -e
@@ -798,17 +699,17 @@ function wait_for_ssh () {
 
     lxc=$1; shift
   
-    echo $IP is up, waiting for ssh...
+    echo network in guest is up, waiting for ssh...
 
-    #wait max 5 min for sshd to start 
+    #wait max 2 min for sshd to start 
     ssh_up=""
-    stop_time=$(($(date +%s) + 300))
     current_time=$(date +%s)
+    stop_time=$(($current_time + 120))
     
     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 ; } || :
+         ssh -o "StrictHostKeyChecking no" $GUEST_IP 'uname -i' && { ssh_up=true; echo "SSHD in container $lxc is UP"; break ; } || :
          sleep 10
          current_time=$(($current_time + 10))
          counter=$(($counter+1))
@@ -827,18 +728,23 @@ function failure () {
 
 function usage () {
     set +x 
-    echo "Usage: $COMMAND_LBUILD [options] lxc-name"
-    echo "Usage: $COMMAND_LTEST [options] lxc-name"
+    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 a test 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 " -n hostname - the hostname to use in container - required with $COMMAND_LTEST"
-    echo " -r repo-url - used to populate yum.repos.d - required with $COMMAND_LTEST"
-    echo " -P pkgs_file - defines the set of extra pacakges"
-    echo "    by default we use vtest.pkgs or devel.pkgs according to $COMMAND"
+    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 " -v be verbose"
     exit 1
 }
@@ -854,31 +760,16 @@ function main () {
           exit 1
     fi
 
-    case "$COMMAND" in
-	$COMMAND_LBUILD)
-	    BUILD_MODE=true ;;
-	$COMMAND_LTEST)
-	    TEST_MODE=true;;
-	*)
-	    usage ;;
-    esac
-
-    echo 'build mode=' $BUILD_MODE 'test mode=' $TEST_MODE
-
-    # the set of preinstalled packages - depends on vbuild or vtest
-    if [ -n "$VBUILD_MODE" ] ; then
-	PREINSTALLED=devel.pkgs
-    else
-	PREINSTALLED=vtest.pkgs
-    fi
-    while getopts "f:d:p:n:r:P:v" opt ; do
+    while getopts "n:f:d:p:r:P:i:m:v" opt ; do
 	case $opt in
+	    n) GUEST_HOSTNAME=$OPTARG;;
 	    f) fcdistro=$OPTARG;;
 	    d) pldistro=$OPTARG;;
 	    p) personality=$OPTARG;;
-	    n) HOSTNAME=$OPTARG;;
 	    r) REPO_URL=$OPTARG;;
 	    P) PREINSTALLED=$OPTARG;;
+            i) IMAGE=$OPTARG;;
+            m) MEMORY=$OPTARG;;
 	    v) VERBOSE=true; set -x;;
 	    *) usage ;;
 	esac
@@ -889,19 +780,59 @@ function main () {
     # parse fixed arguments
     [[ -z "$@" ]] && usage
     lxc=$1 ; shift
+    lxc_root=/vservers/$lxc
+
+    # rainchecks
+    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
+        [ ! -d "$IMAGE" ] && \
+        { echo "$IMAGE rootfs folder does not exist - exiting" ; exit 1 ; }
+        rsync -a $IMAGE/ $lxc_root/
+    fi
+
 
     # check we've exhausted the arguments
     [[ -n "$@" ]] && usage
 
+    # BUILD_MODE is true unless we specified a hostname
+    [ -n "$GUEST_HOSTNAME" ] || BUILD_MODE=true
+
+    # set default values
     [ -z "$fcdistro" ] && fcdistro=$DEFAULT_FCDISTRO
     [ -z "$pldistro" ] && pldistro=$DEFAULT_PLDISTRO
     [ -z "$personality" ] && personality=$DEFAULT_PERSONALITY
+    [ -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 "$BUILD_MODE" ] ; then
+	    PREINSTALLED=devel.pkgs
+	else
+	    PREINSTALLED=runtime.pkgs
+	fi
+    fi
+
     if [ -n "$BUILD_MODE" ] ; then
-        [ -z "$HOSTNAME" ] && HOSTNAME=$lxc
+	# we can now set GUEST_HOSTNAME safely
+        [ -z "$GUEST_HOSTNAME" ] && GUEST_HOSTNAME=$(echo $lxc | sed -e 's,\.,-,g')
     else
-	[[ -z "$HOSTNAME" ]] && usage
-	[[ -z "$REPO_URL" ]] && echo "WARNING -- setting up a yum repo is recommended" 
+	# 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 [ "$REPO_URL" == "none" ] ; then
+	    REPO_URL=""
+	elif [ -z "$REPO_URL" ] ; then
+	    echo "WARNING -- setting up a yum repo is recommended" 
+	fi
     fi
 
     ##########
@@ -917,59 +848,31 @@ function main () {
         echo "Unknown personality: $personality"
     fi
 
-    # need lxc installed before we can run lxc-ls
-    # need bridge installed
-    create_bridge_if_needed
+    # compute networking details for the test mode
+    # (build mode relies entirely on dhcp on the private subnet)
+    if [ -z "$BUILD_MODE" ] ; then
 
-    if [ -n "$BUILD_MODE" ] ; then
+	#create_bridge_if_needed $PUBLIC_BRIDGE
+	lbuild-bridge.sh $PUBLIC_BRIDGE
 
-	# Bridge IP affectation
-	byte=$(random_private_byte)
-	IP=${PRIVATE_PREFIX}$byte
-	NETMASK=$(masklen_to_netmask $PRIVATE_MASKLEN)
-	GATEWAY=$PRIVATE_GATEWAY
-	
-        lxc_network_type=veth
-        lxc_network_link=virbr0
-	veth_pair="veth$byte"
-        echo "the IP address of container $lxc is $IP "
-    else
-        [[ -z "HOSTNAME" ]] && usage
-       
-	IP=$(gethostbyname $HOSTNAME)
+	GUEST_IP=$(gethostbyname $GUEST_HOSTNAME)
 	# use same NETMASK as bridge interface br0
-	MASKLEN=$(ip addr show $INTERFACE_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}')
-        lxc_network_type=veth
-        lxc_network_link=$INTERFACE_BRIDGE
-        veth_pair="i$(echo $HOSTNAME | cut -d. -f1)"
-
+	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="i$(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 in filesystem - exiting" ; exit 1 ; }
-    virsh --connect lxc:// domuuid $lxc >& /dev/null && \
-	{ echo "container $lxc already exists in libvirt - exiting" ; exit 1 ; }
-
     setup_lxc $lxc $fcdistro $pldistro $personality 
 
     devel_or_vtest_tools $lxc $fcdistro $pldistro $personality
 
+    # container gets started here
     post_install $lxc $personality
     
     echo $COMMAND Done
+
+    exit 0
 }
 
 main "$@"