X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=f37f419be029df6b9c15e403ae07970e9e622702;hb=01d7510455252dc6cdb9b3a483c7cfb6940c3f54;hp=5f51503a183c19cb04be937b2bcfa6e59e56cb30;hpb=b4dcf590f6c1aaaf3f4d508dfa207ed5fed6851e;p=build.git diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index 5f51503a..f37f419b 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -19,6 +19,8 @@ export PATH=$PATH:/bin:/sbin . 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 @@ -32,6 +34,8 @@ PUBLIC_BRIDGE=br0 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" @@ -69,7 +73,7 @@ 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) echo debootstrap ;; *) echo Unknown distro $fcdistro ;; esac } @@ -103,14 +107,14 @@ function fedora_install() { 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 @@ -120,18 +124,21 @@ function fedora_install() { 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 @@ -155,7 +162,7 @@ function fedora_download() { 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" @@ -209,6 +216,9 @@ function fedora_configure() { # set the hostname case "$fcdistro" in f18|f2?) + cat < ${lxc_root}/etc/sysconfig/network +NETWORKING=yes +EOF cat < ${lxc_root}/etc/hostname $GUEST_HOSTNAME EOF @@ -267,8 +277,8 @@ function fedora_configure_init() { # 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 @@ -291,7 +301,7 @@ function fedora_configure_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 @@ -305,29 +315,29 @@ function fedora_configure_yum () { 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 < ${lxc_root}/etc/hostname $GUEST_HOSTNAME @@ -441,7 +451,7 @@ function setup_lxc() { esac # Enable cgroup -- xxx -- is this really useful ? - mkdir $lxc_root/cgroup + [ -d $lxc_root/cgroup ] || mkdir $lxc_root/cgroup # set up resolv.conf cp /etc/resolv.conf $lxc_root/etc/resolv.conf @@ -582,22 +592,22 @@ 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 $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 @@ -612,8 +622,8 @@ function devel_or_vtest_tools () { 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.. ;; @@ -628,21 +638,25 @@ function devel_or_vtest_tools () { 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 + virsh -c lxc:/// lxc-enter-namespace $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 () { @@ -656,7 +670,7 @@ 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 @@ -676,7 +690,7 @@ 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 $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 @@ -745,6 +759,7 @@ function usage () { 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 } @@ -760,7 +775,8 @@ function main () { 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;; @@ -770,6 +786,7 @@ function main () { P) PREINSTALLED=$OPTARG;; i) IMAGE=$OPTARG;; m) MEMORY=$OPTARG;; + s) START_VM= ;; v) VERBOSE=true; set -x;; *) usage ;; esac @@ -813,7 +830,7 @@ function main () { 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 @@ -860,7 +877,7 @@ function main () { 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