. build.common
+# XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s
+
DEFAULT_FCDISTRO=f20
DEFAULT_PLDISTRO=lxc
DEFAULT_PERSONALITY=linux64
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"
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
# 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
# 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
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
+ #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
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
### 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
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 || :
+ #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
- 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"
+ 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
- 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
+ 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
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:i:m: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) PREINSTALLED=$OPTARG;;
i) IMAGE=$OPTARG;;
m) MEMORY=$OPTARG;;
+ s) START_VM= ;;
v) VERBOSE=true; set -x;;
*) usage ;;
esac
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
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
git://git.onelab.eu / build.git / blobdiff