X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-init-vserver.sh;h=301b8389549fdc4771cb52064ebd062536fda756;hb=9772e48f9a87327cb1689c2705dda402a1706dfb;hp=41d1dc0600ea82e867ea40a70cfc9f3cef533fd2;hpb=ae92fd42495682604ae680453d4f95b91ce3b38c;p=build.git diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh index 41d1dc06..301b8389 100755 --- a/vbuild-init-vserver.sh +++ b/vbuild-init-vserver.sh @@ -10,9 +10,9 @@ DIRNAME=$(dirname $0) PATH=$(dirname $0):$PATH export PATH . build.common -DEFAULT_FCDISTRO=f8 +DEFAULT_FCDISTRO=f14 DEFAULT_PLDISTRO=planetlab -DEFAULT_PERSONALITY=linux32 +DEFAULT_PERSONALITY=linux64 DEFAULT_IFNAME=eth0 COMMAND_VBUILD="vbuild-init-vserver.sh" @@ -33,6 +33,7 @@ function configure_yum_in_vserver () { vserver=$1; shift fcdistro=$1; shift + pldistro=$1; shift templates=/etc/vservers/.distributions/${fcdistro} if [ -f ${templates}/yum/yum.conf ] ; then @@ -63,8 +64,9 @@ function configure_yum_in_vserver () { echo "WARNING : cannot create myplc repo" else # exclude kernel from fedora repos + yumexclude=$(pl_plcyumexclude $fcdistro $pldistro $DIRNAME) for repo in /vservers/$vserver/etc/yum.repos.d/* ; do - [ -f $repo ] && yumconf_exclude $repo "exclude=$pl_KEXCLUDES" + [ -f $repo ] && yumconf_exclude $repo "exclude=$yumexclude" done # the build repo is not signed at this stage cat > /vservers/$vserver/etc/yum.repos.d/myplc.repo < *before* populating it +function almost_empty () { + dir="$1"; shift ; + # non existing is fine + [ ! -d $dir ] && return 0; + # need to have at most one file + count=$(cd $dir; ls | wc -l); [ $count -le 1 ]; +} + function setup_vserver () { set -x @@ -110,12 +135,14 @@ function setup_vserver () { vserver=$1; shift fcdistro=$1; shift + pldistro=$1; shift personality=$1; shift - if [ -d /vservers/$vserver ] ; then + # check that this is a new one - see above + almost_empty /vservers/$vserver || { echo "$COMMAND : vserver $vserver seems to exist - bailing out" exit 1 - fi + } pkg_method=$(package_method $fcdistro) case $pkg_method in @@ -124,10 +151,11 @@ function setup_vserver () { ;; debootstrap) arch=$(canonical_arch $personality $fcdistro) - build_options="-m debootstrap -- -d $fcdistro -- --arch $arch" + debmirror=$(debian_mirror $fcdistro) + build_options="-m debootstrap -- -d $fcdistro -m $debmirror -- --arch $arch" ;; *) - build_options="something wrong" ;; + build_options="undefined-package_method" ;; esac # create it @@ -139,8 +167,8 @@ function setup_vserver () { echo "* ${i}-th attempt to 'vserver build' failed - waiting for 3 seconds" sleep 3 done - # check success - [ -d /vservers/$vserver ] + # check success - not enough to check for the directory, let's assume /etc/ in image + [ -d /vservers/$vserver/etc ] if [ ! -z "$personality" ] ; then if [ -f "/etc/vservers/$vserver/personality" ] ; then @@ -154,18 +182,22 @@ function setup_vserver () { fi BCAPFILE=/etc/vservers/$vserver/bcapabilities + touch $BCAPFILE if [ -n "$VBUILD_MODE" ] ; then ### capabilities required for a build vserver # set up appropriate vserver capabilities to mount, mknod and IPC_LOCK - touch $BCAPFILE grep -q ^CAP_SYS_ADMIN $BCAPFILE || echo CAP_SYS_ADMIN >> $BCAPFILE grep -q ^CAP_MKNOD $BCAPFILE || echo CAP_MKNOD >> $BCAPFILE grep -q ^CAP_IPC_LOCK $BCAPFILE || echo CAP_IPC_LOCK >> $BCAPFILE + # useful for f16 guests that use set_cap_file + grep -q ^CAP_SETFCAP $BCAPFILE || echo CAP_SETFCAP >> $BCAPFILE else ### capabilities required for a myplc vserver # for /etc/plc.d/gpg - need to init /dev/random grep -q ^CAP_MKNOD $BCAPFILE || echo CAP_MKNOD >> $BCAPFILE grep -q ^CAP_NET_BIND_SERVICE $BCAPFILE || echo CAP_NET_BIND_SERVICE >> $BCAPFILE + # useful for f16 guests that use set_cap_file + grep -q ^CAP_SETFCAP $BCAPFILE || echo CAP_SETFCAP >> $BCAPFILE fi # Set persistent for the network context @@ -178,12 +210,10 @@ function setup_vserver () { # Enable cgroup mkdir /etc/vservers/$vserver/cgroup - # Start Vserver automatically on boot - echo "default" > /etc/vservers/$vserver/apps/init/mark - - # Set the init style of your vserver to plain for f13 and higher + # Set the init style of your vserver to plain for f16 and higher + # not working with f16 anyways, systemd requires 2.6.36 to work case $fcdistro in - f1[3-9]) echo plain > /etc/vservers/$vserver/apps/init/style ;; + f1[5-9]) echo plain > /etc/vservers/$vserver/apps/init/style ;; esac if [ "$pkg_method" = "yum" ] ; then @@ -195,11 +225,30 @@ function setup_vserver () { sleep 3 done fi + + # turns out that with wheezy at least, at this point we're getting + # /vservers//var/run -> /run + # /vservers//var/lock -> /run/lock + # trying to fix this with relative links does not appear to work fine + # when trying to vserver start we're then getting + # + exec /usr/sbin/vspace --mount --fs --new -- /usr/sbin/vserver ----nonamespace debuild09 start + # fakerunlevel: open("/var/run/utmp"): No such file or directory + # so instead we bluntly create empty dirs and hope for the best +# if [ "$pkg_method" = "debootstrap" ] ; then + [ -h /vservers/$vserver/var/run ] && [ ! -d /vservers/$vserver/var/run ] && \ +# { rm -f /vservers/$vserver/var/run ; ln -s ../run /vservers/$vserver/var/run ; } + { rm -f /vservers/$vserver/var/run ; mkdir /vservers/$vserver/var/run ; } + [ -h /vservers/$vserver/var/lock ] && [ ! -d /vservers/$vserver/var/lock ] && \ +# { rm -f /vservers/$vserver/var/lock ; ln -s ../run/lock /vservers/$vserver/var/lock ; } + { rm -f /vservers/$vserver/var/lock ; mkdir /vservers/$vserver/var/lock ; } +# fi # start the vserver so we can do the following operations # redirect out/err to protect against the vserver's init sequence getting stalled # mostly used for f10 vservers created remotely through ssh - $personality vserver $VERBOSE $vserver start >& /dev/null + # with ubuntu/raring, somehow this fails, so ignore retcod, + # as subsequent vserver exec will fail anyway + $personality vserver $VERBOSE $vserver start >& /dev/null || : if [ "$pkg_method" == "yum" ] ; then $personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*" @@ -227,6 +276,10 @@ function setup_vserver () { # try the simple way, if that fails try to cross fix the rpm hashes $personality vserver $VERBOSE $vserver exec rpm --rebuilddb || translate_rpm_hashes $personality $vserver + + elif [ "$pkg_method" == "debootstrap" ] ; then + # just check the vm is running + $personality vserver $VERBOSE $vserver exec arch fi # check if the vserver kernel is using VSERVER_DEVICE (vdevmap) support @@ -239,10 +292,11 @@ function setup_vserver () { fi # minimal config in the vserver for yum to work - [ "$pkg_method" = "yum" ] && configure_yum_in_vserver $vserver $fcdistro + [ "$pkg_method" = "yum" ] && configure_yum_in_vserver $vserver $fcdistro $pldistro # set up resolv.conf cp /etc/resolv.conf /vservers/$vserver/etc/resolv.conf + cp /etc/resolv.conf /vservers/$vserver/etc/resolv.conf.preserve # and /etc/hosts for at least localhost [ -f /vservers/$vserver/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > /vservers/$vserver/etc/hosts @@ -261,13 +315,7 @@ function devel_or_vtest_tools () { pkg_method=$(package_method $fcdistro) - # check for .pkgs file based on pldistro - if [ -n "$VBUILD_MODE" ] ; then - pkgsname=devel.pkgs - else - pkgsname=vtest.pkgs - fi - pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $pkgsname) + pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $PREINSTALLED) ### install individual packages, then groups # get target arch - use uname -i here (we want either x86_64 or i386) @@ -278,17 +326,57 @@ function devel_or_vtest_tools () { packages=$(pl_getPackages -a $vserver_arch $fcdistro $pldistro $pkgsfile) groups=$(pl_getGroups -a $vserver_arch $fcdistro $pldistro $pkgsfile) - [ "$pkg_method" = yum ] && [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages - [ "$pkg_method" = yum ] && for group_plus in $groups; do - group=$(echo $group_plus | sed -e "s,+++, ,g") - $personality vserver $vserver exec yum -y groupinstall "$group" - done + case "$pkg_method" in + yum) + [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages + for group_plus in $groups; do + group=$(echo $group_plus | sed -e "s,+++, ,g") + $personality vserver $vserver exec yum -y groupinstall "$group" + done + # store current rpm list in /init-vserver.rpms in case we need to check the contents + $personality vserver $vserver exec rpm -aq > /vservers/$vserver/init-vserver.rpms + ;; + debootstrap) + # for ubuntu + if grep -iq ubuntu /vservers/$vserver/etc/lsb-release 2> /dev/null; then + # on ubuntu, at this point we end up with a single feed in /etc/apt/sources.list + # we need at least to add the 'universe' feed for python-rpm + ( cd /vservers/$vserver/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/$vserver/etc/apt ; head -1 sources.list | sed -e 's, main,-updates main,' > sources.list.d/updates.list ) + fi + $personality vserver $vserver exec apt-get update + # ignore result because that one failed on precise +sc $personality vserver $vserver exec apt-get -y upgrade ||: + # handle this one firt off to be sure; mostly cosmetic but avoid a huge amount of warnings + $personality vserver $vserver exec apt-get install -y locales + $personality vserver $vserver exec locale-gen en_US.UTF-8 + # install required packages + # all in a single batch + [ -n "$packages" ] && $personality vserver $vserver exec apt-get install -y --ignore-missing $packages || : + # of course, on ubuntu apt-get --ignore-missing .. does not ignore missing packages ! + # check it up a bit + for package in $packages ; do + if $personality vserver $vserver exec dpkg -l $package >& /dev/null ; then + echo "==========(debian) package $package OK (1)" + else + # try to install it individually - so this is for ubuntu + $personality vserver $vserver exec apt-get install -y $package || : + # still not there ? + if $personality vserver $vserver exec dpkg -l $package >& /dev/null ; then + echo "==========(debian) package $package OK (2)" + else + echo "==========(debian) package $package MISSING - ignored" + fi + fi + done + ### xxx todo install groups with apt.. + ;; + *) + echo "unknown pkg_method $pkg_method" + ;; + esac - [ "$pkg_method" = debootstrap ] && $personality vserver $vserver exec apt-get update - [ "$pkg_method" = debootstrap ] && for package in $packages ; do - $personality vserver $vserver exec apt-get install -y $package - done - return 0 } @@ -435,6 +523,7 @@ function usage () { echo " -d pldistro - defaults to $DEFAULT_PLDISTRO" echo " -p personality - defaults to $DEFAULT_PERSONALITY" echo " -i ifname: determines ip and netmask attached to ifname, and passes it to the vserver" + echo " -r : set apps/init/mark to default so the vserver restart upon reboot" echo " -v : verbose - passes -v to calls to vserver" echo "vserver-options" echo " all args after the optional -- are passed to vserver build " @@ -460,14 +549,24 @@ function main () { esac VERBOSE= + RESISTANT="" IFNAME="" VSERVER_OPTIONS="" - while getopts "f:d:p:i:v" opt ; do + + # the set of preinstalled packages - depends on vbuild or vtest + if [ -n "$VBUILD_MODE" ] ; then + PREINSTALLED=devel.pkgs + else + PREINSTALLED=vtest.pkgs + fi + while getopts "f:d:p:P:i:rv" opt ; do case $opt in f) fcdistro=$OPTARG;; d) pldistro=$OPTARG;; p) personality=$OPTARG;; + P) PREINSTALLED=$OPTARG;; i) IFNAME=$OPTARG;; + r) RESISTANT="true";; v) VERBOSE="-v" ;; *) usage ;; esac @@ -506,10 +605,14 @@ function main () { [ -z "$pldistro" ] && pldistro=$DEFAULT_PLDISTRO [ -z "$personality" ] && personality=$DEFAULT_PERSONALITY - setup_vserver $vserver $fcdistro $personality + setup_vserver $vserver $fcdistro $pldistro $personality devel_or_vtest_tools $vserver $fcdistro $pldistro $personality post_install $vserver $personality + # Start Vserver automatically on boot + [ -n "$RESISTANt" ] && echo "default" > /etc/vservers/$vserver/apps/init/mark + + echo $COMMAND Done } main "$@"