#!/bin/bash
-# -*-shell-*-
# close stdin, as with ubuntu and debian VMs this script tends to hang and wait for input ..
0<&-
# the network interface name as seen from the container
VIF_GUEST=eth0
+##########
+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
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
# 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"
+ echo "$YUM install $FEDORA_PREINSTALLED"
$YUM install $PKG_LIST || { echo "Failed to download rootfs, aborting." ; return 1; }
mv "$INSTALL_ROOT" "$cache/rootfs"
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
+ 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"
}
function debian_configure () {
function write_guest_interfaces_test () {
cat <<EOF
auto $VIF_GUEST
-iface $VIF_GUEST
- address $GUEST_IP
- netmask $NETMASK
- gateway $GATEWAY
+iface $VIF_GUEST inet static
+address $GUEST_IP
+netmask $NETMASK
+gateway $GATEWAY
EOF
}
##############################
fedora_configure || { echo "failed to configure fedora for a container"; exit 1 ; }
;;
debootstrap)
- debian_install || { echo "failed to install debian/ubuntu root image"; exit 1 ; }
+ debian_install $lxc || { echo "failed to install debian/ubuntu root image"; exit 1 ; }
debian_configure || { echo "failed to configure debian/ubuntu for a container"; exit 1 ; }
;;
*)
# 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 )
fi
- chroot $lxc_root apt-get update
+ # already done earlier - chroot $lxc_root apt-get update
for package in $packages ; do
- # close stdin in an attempt to avoid this hanging
- # xxx also we ignore result for now, not sure if the kind of errors like below
- # truly is serious or not
+# 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
-
- chroot $lxc_root apt-get install -y $package < /dev/null || :
+ virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "apt-get install -y $package" || :
done
### xxx todo install groups with apt..
;;
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
fi
# setup localtime from the host
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
# 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}')
+ GATEWAY=$(ip route show | grep default | awk '{print $3}' | head -1)
VIF_HOST="i$(echo $GUEST_HOSTNAME | cut -d. -f1)"
fi