# 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
# 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 || { echo "Failed to download rootfs, aborting." ; return 1; }
+ 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."
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
+
}
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 ; }
;;
*)
# grant ssh access from host to guest
mkdir $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
( 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
- 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
-#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 || :
+ # 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..
;;
personality=$1; shift
if [ -n "$BUILD_MODE" ] ; then
post_install_build $lxc $personality
- lxc_start $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
- lxc_start $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
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 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
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
devel_or_vtest_tools $lxc $fcdistro $pldistro $personality
+ # container gets started here
post_install $lxc $personality
echo $COMMAND Done
git://git.onelab.eu / build.git / blobdiff