#!/bin/bash
+# -*-shell-*-
# close stdin, as with ubuntu and debian VMs this script tends to hang and wait for input ..
0<&-
DIRNAME=$(dirname $0)
BUILD_DIR=$(pwd)
-# pkgs parsing utilities
+# 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
. build.common
-DEFAULT_FCDISTRO=f20
+# XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s
+
+DEFAULT_FCDISTRO=f21
DEFAULT_PLDISTRO=lxc
DEFAULT_PERSONALITY=linux64
+DEFAULT_MEMORY=1024
##########
# constant
VIF_GUEST=eth0
##########
+FEDORA_MIRROR_BASE="http://mirror.onelab.eu/fedora/"
+FEDORA_MIRROR_KEYS="http://mirror.onelab.eu/keys/"
FEDORA_PREINSTALLED="yum initscripts passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients"
DEBIAN_PREINSTALLED="openssh-server openssh-client"
-##############################
-## 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("veth")==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
-}
-
-########## networking -- ctd
+########## networking utilities
function gethostbyname () {
hostname=$1
python -c "import socket; print socket.gethostbyname('"$hostname"')" 2> /dev/null
EOF
}
-#################### bridge initialization
-function create_bridge_if_needed() {
-
- # turn on verbosity
- set -x
-
- # already created ? - we're done
- ip addr show $PUBLIC_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 PUBLIC_BRIDGE=$PUBLIC_BRIDGE"
- brctl addbr $PUBLIC_BRIDGE
- brctl addif $PUBLIC_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 $PUBLIC_BRIDGE"
- dhclient $PUBLIC_BRIDGE
- sleep 1
-
- #Reconfigure the routing table
- echo "Configuring gateway=$gateway"
- ip route add default via $gateway dev $PUBLIC_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 $PUBLIC_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 ;;
+ squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty|utopic) echo debootstrap ;;
*) echo Unknown distro $fcdistro ;;
esac
}
count=$(cd $dir; ls | wc -l); [ $count -le 1 ];
}
-##############################
-function check_yum_installed () {
- package=$1; shift
- rpm -q $package >& /dev/null || yum -y install $package
-}
-
-function check_yumgroup_installed () {
- group="$1"; shift
- yum grouplist "$group" | grep -q Installed || { yum -y groupinstall "$group" ; }
-}
-
##############################
function fedora_install() {
set -x
set -e
cache=/var/cache/lxc/fedora/$arch/$release
+ mkdir -p $cache
- mkdir -p /var/lock/subsys/
(
- flock -n -x 200 || { echo "Cache repository is busy." ; return 1 ; }
+ flock --exclusive --timeout 60 200 || { echo "Cache repository is busy." ; return 1 ; }
if [ ! -e "$cache/rootfs" ]; then
echo "Getting cache download in $cache/rootfs ... "
- fedora_download || { echo "Failed to download 'fedora base'"; return 1; }
+ fedora_download $cache || { echo "Failed to download 'fedora base'"; return 1; }
else
echo "Updating cache $cache/rootfs ..."
if ! yum --installroot $cache/rootfs -y --nogpgcheck update ; then
fi
fi
- echo "Copy $cache/rootfs to $lxc_root ... "
+ echo "Filling $lxc_root from $cache/rootfs ... "
rsync -a $cache/rootfs/ $lxc_root/
return 0
- ) 200>/var/lock/subsys/lxc
+ ) 200> $cache/lock
return $?
}
function fedora_download() {
set -x
+
+ cache=$1; shift
+
# check the mini fedora was not already downloaded
INSTALL_ROOT=$cache/partial
echo $INSTALL_ROOT
sed -i "s/\$basearch/$arch/g; s/\$releasever/$release/g;" $f
done
- MIRROR_URL=http://mirror.onelab.eu/fedora/releases/$release/Everything/$arch/os
+ MIRROR_URL=$FEDORA_MIRROR_BASE/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"
+ # first try the second version of fedora-release first
+ RELEASE_URL2="$MIRROR_URL/Packages/f/fedora-release-$release-2.noarch.rpm"
+ RELEASE_URL3="$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
+ for attempt in $RELEASE_URL1 $RELEASE_URL2 $RELEASE_URL3; do
if curl -f $attempt -o $RELEASE_TARGET ; then
echo "Retrieved $attempt"
found=true
YUM="yum --installroot=$INSTALL_ROOT --nogpgcheck -y"
echo "$YUM install $FEDORA_PREINSTALLED"
- $YUM install $PKG_LIST || { echo "Failed to download rootfs, aborting." ; return 1; }
+ $YUM install $FEDORA_PREINSTALLED || { echo "Failed to download rootfs, aborting." ; return 1; }
mv "$INSTALL_ROOT" "$cache/rootfs"
echo "Download complete."
# set the hostname
case "$fcdistro" in
f18|f2?)
+ cat <<EOF > ${lxc_root}/etc/sysconfig/network
+NETWORKING=yes
+EOF
cat <<EOF > ${lxc_root}/etc/hostname
$GUEST_HOSTNAME
EOF
guest_ifcfg=${lxc_root}/etc/sysconfig/network-scripts/ifcfg-$VIF_GUEST
( [ -n "$BUILD_MODE" ] && write_guest_ifcfg_build || write_guest_ifcfg_test ) > $guest_ifcfg
- fedora_configure_yum $lxc $fcdistro $pldistro
+ [ -z "$IMAGE" ] && fedora_configure_yum $lxc $fcdistro $pldistro
return 0
}
# 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
+ chroot ${lxc_root} $personality chkconfig udev-post off
+ chroot ${lxc_root} $personality chkconfig network on
}
# this code of course is for guests that do run on systemd
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
+ chroot ${lxc_root} $personality chkconfig network on
}
# overwrite container yum config
pldistro=$1; shift
# rpm --rebuilddb
- chroot $lxc_root rpm --rebuilddb
+ chroot ${lxc_root} $personality rpm --rebuilddb
echo "Initializing yum.repos.d in $lxc"
rm -f $lxc_root/etc/yum.repos.d/*
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/
+name=Fedora \$releasever - \$basearch
+baseurl=$FEDORA_MIRROR_BASE/releases/\$releasever/Everything/\$basearch/os/
enabled=1
metadata_expire=7d
gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-$release-primary
+gpgkey=$FEDORA_MIRROR_KEYS/RPM-GPG-KEY-fedora-$release-primary
[updates]
-name=Fedora $release - $arch - Updates
-baseurl=http://mirror.onelab.eu/fedora/updates/$release/$arch/
+name=Fedora \$releasever - \$basearch - Updates
+baseurl=$FEDORA_MIRROR_BASE/updates/\$releasever/\$basearch/
enabled=1
metadata_expire=7d
gpgcheck=1
-gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-$release-primary
+gpgkey=$FEDORA_MIRROR_KEYS/RPM-GPG-KEY-fedora-$release-primary
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
case $fcdistro in
squeeze|wheezy|jessie)
echo http://ftp2.fr.debian.org/debian/ ;;
- oneiric|precise|quantal|raring|saucy)
+ oneiric|precise|quantal|raring|saucy|trusty|utopic)
echo http://mir1.ovh.net/ubuntu/ubuntu/ ;;
*) echo unknown distro $fcdistro; exit 1;;
esac
mirror=$(debian_mirror $fcdistro)
debootstrap --arch $arch $fcdistro $lxc_root $mirror
# just like with fedora we ensure a few packages get installed as well
- virsh -c lxc:/// $lxc lxc-enter-namespace /bin/bash -c "apt-get update"
- virsh -c lxc:/// $lxc lxc-enter-namespace /bin/bash -c "apt-get -y install $DEBIAN_PREINSTALLED"
+ # 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 () {
pkg_method=$(package_method $fcdistro)
case $pkg_method in
yum)
- fedora_install || { echo "failed to install fedora root image"; exit 1 ; }
+ 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)
- debian_install $lxc || { echo "failed to install debian/ubuntu root image"; 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 ; }
;;
*)
esac
# Enable cgroup -- xxx -- is this really useful ?
- mkdir $lxc_root/cgroup
+ [ -d $lxc_root/cgroup ] || mkdir $lxc_root/cgroup
- # set up resolv.conf
+ ### 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
cp /etc/resolv.conf $lxc_root/etc/resolv.conf
- # and /etc/hosts for at least localhost
+ ### 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 $lxc_root/root/.ssh
+ 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
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_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>
</interface>
<console type='pty' />
</devices>
- <network>
- <name>host-bridge</name>
- <forward mode="bridge"/>
- <bridge name="$PUBLIC_BRIDGE"/>
- </network>
</domain>
EOF
}
cat <<EOF
<domain type='lxc'>
<name>$lxc</name>
- <memory>524288</memory>
+ <memory>$MEMORY</memory>
<os>
<type arch='$arch2'>exe</type>
<init>/sbin/init</init>
### install individual packages, then groups
# get target arch - use uname -i here (we want either x86_64 or i386)
- lxc_arch=$(chroot $lxc_root uname -i)
+ lxc_arch=$(chroot ${lxc_root} $personality uname -i)
# on debian systems we get arch through the 'arch' command
- [ "$lxc_arch" = "unknown" ] && lxc_arch=$(chroot $lxc_root 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)
case "$pkg_method" in
yum)
- [ -n "$packages" ] && chroot $lxc_root yum -y install $packages
+ [ -n "$packages" ] && chroot ${lxc_root} $personality yum -y install $packages
for group_plus in $groups; do
group=$(echo $group_plus | sed -e "s,+++, ,g")
- chroot $lxc_root yum -y groupinstall "$group"
+ chroot ${lxc_root} $personality yum -y groupinstall "$group"
done
# store current rpm list in /init-lxc.rpms in case we need to check the contents
- chroot $lxc_root rpm -aq > $lxc_root/init-lxc.rpms
+ chroot ${lxc_root} $personality rpm -aq > $lxc_root/init-lxc.rpms
;;
debootstrap)
# for ubuntu
( 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
- # already done earlier - chroot $lxc_root apt-get update
for package in $packages ; do
-# xxx also we ignore result for now, not sure if the kind of errors like below
-# truly is serious or not
-#Setting up at (3.1.13-2ubuntu2) ...
-#initctl: Unable to connect to Upstart: Failed to connect to socket /com/ubuntu/upstart: Connection refused
-#initctl: Unable to connect to Upstart: Failed to connect to socket /com/ubuntu/upstart: Connection refused
-#start: Unable to connect to Upstart: Failed to connect to socket /com/ubuntu/upstart: Connection refused
- virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "apt-get install -y $package" || :
+ # 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..
;;
function post_install () {
lxc=$1; shift
personality=$1; shift
+ # setup localtime from the host
+ cp /etc/localtime $lxc_root/etc/localtime
if [ -n "$BUILD_MODE" ] ; then
post_install_build $lxc $personality
- 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"
+ if [ -n "$START_VM" ] ; then
+ virsh -c lxc:/// start $lxc
+ # manually run dhclient in guest - somehow this network won't start on its own
+ # we need the --noseclabel flag with recent libvirt's
+ # was not required with f20/libvirt-1.2.5
+ # but is now with f21/libvirt-1.2.9
+ virsh -c lxc:/// lxc-enter-namespace --noseclabel $lxc /usr/bin/$personality /bin/bash -c "dhclient $VIF_GUEST"
+ fi
else
post_install_myplc $lxc $personality
- 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
+ if [ -n "$START_VM" ] ; then
+ 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
fi
- # setup localtime from the host
- cp /etc/localtime $lxc_root/etc/localtime
}
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 $lxc_root bash -x
+ cat << EOF | chroot ${lxc_root} $personality bash -x
# customize root's prompt
/bin/cat << PROFILE > /root/.profile
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 $lxc_root 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
EOF
}
-function lxc_start() {
-
- 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
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
}
exit 1
fi
- while getopts "n:f:d:p:r:P:v" opt ; do
+ START_VM=true
+ while getopts "n:f:d:p:r:P:i:m:sv" opt ; do
case $opt in
n) GUEST_HOSTNAME=$OPTARG;;
f) fcdistro=$OPTARG;;
p) personality=$OPTARG;;
r) REPO_URL=$OPTARG;;
P) PREINSTALLED=$OPTARG;;
+ i) IMAGE=$OPTARG;;
+ m) MEMORY=$OPTARG;;
+ s) START_VM= ;;
v) VERBOSE=true; set -x;;
*) usage ;;
esac
[[ -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 ; }
{ 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
[ -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 [ -z "$PREINSTALLED" ] ; then
if [ -n "$BUILD_MODE" ] ; then
PREINSTALLED=devel.pkgs
else
if [ -n "$BUILD_MODE" ] ; then
# we can now set GUEST_HOSTNAME safely
- [ -z "$GUEST_HOSTNAME" ] && GUEST_HOSTNAME=$lxc
+ [ -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
# (build mode relies entirely on dhcp on the private subnet)
if [ -z "$BUILD_MODE" ] ; then
- create_bridge_if_needed
+ #create_bridge_if_needed $PUBLIC_BRIDGE
+ lbuild-bridge.sh $PUBLIC_BRIDGE
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)
+ 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)"
+ VIF_HOST="vif$(echo $GUEST_HOSTNAME | cut -d. -f1)"
fi
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 "$@"
git://git.onelab.eu / build.git / blobdiff