X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-init-vserver.sh;h=7aed8179af4e188329654c9eb7326851632432ea;hb=refs%2Fheads%2Flxc_devel;hp=6daca03eb02cd267e95ed06ece5b558447800980;hpb=e660bf56db32cae88bfb5c25a9918490956554a8;p=build.git diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh index 6daca03e..7aed8179 100755 --- a/vbuild-init-vserver.sh +++ b/vbuild-init-vserver.sh @@ -1,12 +1,14 @@ #!/bin/bash # -*-shell-*- -# $Id$ + +#shopt -s huponexit COMMAND=$(basename $0) DIRNAME=$(dirname $0) # pkgs parsing utilities -PATH=$(dirname $0):$PATH . build.common +PATH=$(dirname $0):$PATH export PATH +. build.common DEFAULT_FCDISTRO=f8 DEFAULT_PLDISTRO=planetlab @@ -32,35 +34,37 @@ function configure_yum_in_vserver () { vserver=$1; shift fcdistro=$1; shift - pushd /etc/vservers/.distributions/${fcdistro} - if [ -f yum/yum.conf ] ; then - echo "Initializing yum.conf in $vserver from $(pwd)/yum" + templates=/etc/vservers/.distributions/${fcdistro} + if [ -f ${templates}/yum/yum.conf ] ; then + echo "Initializing yum.conf in $vserver from ${templates}/yum" sed -e "s!@YUMETCDIR@!/etc!g; s!@YUMCACHEDIR@!/var/cache/yum!g; s!@YUMLOGDIR@!/var/log!g; s!@YUMLOCKDIR@!/var/lock!g; - " yum/yum.conf > /vservers/$vserver/etc/yum.conf + " ${templates}/yum/yum.conf > /vservers/$vserver/etc/yum.conf # post process the various @...@ variables from this yum.conf file. else echo "Using $fcdistro default for yum.conf" fi - if [ -d yum.repos.d ] ; then - echo "Initializing yum.repos.d in $vserver from $(pwd)/yum.repos.d" + if [ -d ${templates}/yum.repos.d ] ; then + echo "Initializing yum.repos.d in $vserver from ${templates}/yum.repos.d" rm -rf /vservers/$vserver/etc/yum.repos.d - tar cf - yum.repos.d | tar -C /vservers/$vserver/etc -xvf - + tar -C ${templates} -cf - yum.repos.d | tar -C /vservers/$vserver/etc -xvf - else echo "Cannot initialize yum.repos.d in $vserver" fi - if [ -n "$MYPLC_MODE" ] ; then + # for using vtest-init-vserver.sh as a general-purpose vserver creation wrapper + # just mention 'none' as the repo url + if [ -n "$MYPLC_MODE" -a "$REPO_URL" != "none" ] ; then if [ ! -d /vservers/$vserver/etc/yum.repos.d ] ; then echo "WARNING : cannot create myplc repo" else # exclude kernel from fedora repos - for i in /vservers/$vserver/etc/yum.repos.d/* ; do - [ -f $i ] && echo "$pl_KEXCLUDES" >> $i + for repo in /vservers/$vserver/etc/yum.repos.d/* ; do + [ -f $repo ] && yumconf_exclude $repo "exclude=$pl_KEXCLUDES" 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 @@ -85,22 +121,36 @@ function setup_vserver () { fcdistro=$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 + yum) + build_options="-m yum -- -d $fcdistro" + ;; + debootstrap) + arch=$(canonical_arch $personality $fcdistro) + build_options="-m debootstrap -- -d $fcdistro -- --arch $arch" + ;; + *) + build_options="something wrong" ;; + esac # create it # try to work around the vserver issue: # vc_ctx_migrate: No such process # rpm-fake.so: failed to initialize communication with resolver for i in $(seq 20) ; do - $personality vserver $VERBOSE $vserver build $VSERVER_OPTIONS -m yum -- -d $fcdistro && break || true + $personality vserver $VERBOSE $vserver build $VSERVER_OPTIONS $build_options && break || true 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 @@ -113,74 +163,101 @@ function setup_vserver () { fi 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 - BCAPFILE=/etc/vservers/$vserver/bcapabilities - touch $BCAPFILE - cap=$(grep ^CAP_SYS_ADMIN /etc/vservers/$vserver/bcapabilities | wc -l) - [ $cap -eq 0 ] && echo 'CAP_SYS_ADMIN' >> /etc/vservers/$vserver/bcapabilities - cap=$(grep ^CAP_MKNOD /etc/vservers/$vserver/bcapabilities | wc -l) - [ $cap -eq 0 ] && echo 'CAP_MKNOD' >> /etc/vservers/$vserver/bcapabilities - cap=$(grep ^CAP_IPC_LOCK /etc/vservers/$vserver/bcapabilities | wc -l) - [ $cap -eq 0 ] && echo 'CAP_IPC_LOCK' >> /etc/vservers/$vserver/bcapabilities + 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 - cap=$(grep ^CAP_MKNOD /etc/vservers/$vserver/bcapabilities | wc -l) - [ $cap -eq 0 ] && echo 'CAP_MKNOD' >> /etc/vservers/$vserver/bcapabilities - cap=$(grep ^CAP_NET_BIND_SERVICE /etc/vservers/$vserver/bcapabilities | wc -l) - [ $cap -eq 0 ] && echo 'CAP_NET_BIND_SERVICE' >> /etc/vservers/$vserver/bcapabilities + 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 - $personality vyum $vserver -- -y install yum - # ditto - for i in $(seq 20) ; do - $personality vserver $VERBOSE $vserver pkgmgmt internalize && break || true - echo "* ${i}-th attempt to 'vserver pkgmgmt internalize' failed - waiting for 3 seconds" - sleep 3 - done + # Set persistent for the network context + # Thierry: Daniel's kernels come with single_ip turned off by default, let's make this explicit + echo "persistent,lback_allow,~single_ip" > /etc/vservers/$vserver/nflags + + # Set cflags + echo -e "persistent\n~info_init" > /etc/vservers/$vserver/cflags + + # Enable cgroup + mkdir /etc/vservers/$vserver/cgroup + + # 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[5-9]) echo plain > /etc/vservers/$vserver/apps/init/style ;; + esac + + if [ "$pkg_method" = "yum" ] ; then + $personality vyum $vserver -- -y install yum + # ditto + for i in $(seq 20) ; do + $personality vserver $VERBOSE $vserver pkgmgmt internalize && break || true + echo "* ${i}-th attempt to 'vserver pkgmgmt internalize' failed - waiting for 3 seconds" + sleep 3 + done + fi # start the vserver so we can do the following operations - $personality vserver $VERBOSE $vserver start - $personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*" - $personality vserver $VERBOSE $vserver exec rpm --rebuilddb - - # with vserver 2.3, granting the vserver CAP_MKNOD is not enough - # check whether we run vs2.3 or above - vs_version=$(uname -a | sed -e 's,.*[\.\-]vs\([0-9]\)\.\([0-9]\)\..*,\1\2,') - # at this stage we have here 22 or 23 - need_vdevmap=$(( $vs_version >= 23 )) - - if [ "$need_vdevmap" == 1 ] ; then - util_vserver_215=0 - vdevmap --help | grep -- --set &> /dev/null && util_vserver_215=1 - - if [ "$util_vserver_215" == 1 ] ; then - ctx=$(cat /etc/vservers/$vserver/context) - vdevmap --set --xid $ctx --open --create --target /dev/null - vdevmap --set --xid $ctx --open --create --target /dev/root - else - echo "You seem to be running vs2.3 with util-vserver < 0.30.215" - echo "This combination is not supported by $COMMAND" - echo "Please upgrade your environment" - exit 1 -# this supposedly is an equivalent to using vdevmap as invoked above -# but it's not going to work in this case -# mkdir -p /etc/vservers/$vserver/apps/vdevmap/default-{block,char} -# touch /etc/vservers/$vserver/apps/vdevmap/default-{block,char}/{open,create} -# echo /dev/root > /etc/vservers/$vserver/apps/vdevmap/default-block/target -# echo /dev/null > /etc/vservers/$vserver/apps/vdevmap/default-char/target - fi + # 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 + + if [ "$pkg_method" == "yum" ] ; then + $personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*" + + # run the host rpmdb_dump and restore with the guest rpmdb_load + function translate_rpm_hashes () { + set -x + set -e + local personality="$1"; shift + local vserver="$1"; shift + # need to have utilities installed + type -p file + type -p awk + type -p cut + guest_dir=/var/lib/rpm + host_dir=/vservers/$vserver/$guest_dir + files=$(cd $host_dir ; file * | grep Hash | cut -d: -f 1) + for file in $files; do + (cd $host_dir && mv $file ${file}-foreign) + /usr/lib/rpm/rpmdb_dump $host_dir/${file}-foreign | $personality vserver $VERBOSE $vserver exec /usr/lib/rpm/rpmdb_load $guest_dir/$file + done + $personality vserver $VERBOSE $vserver exec rpm --rebuilddb + return 0 + } + + # 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 + fi + + # check if the vserver kernel is using VSERVER_DEVICE (vdevmap) support + need_vdevmap=$(grep "CONFIG_VSERVER_DEVICE=y" /boot/config-$(uname -r) | wc -l) + + if [ $need_vdevmap -eq 1 ] ; then + ctx=$(cat /etc/vservers/$vserver/context) + vdevmap --set --xid $ctx --open --create --target /dev/null + vdevmap --set --xid $ctx --open --create --target /dev/root fi # minimal config in the vserver for yum to work - configure_yum_in_vserver $vserver $fcdistro + [ "$pkg_method" = "yum" ] && configure_yum_in_vserver $vserver $fcdistro # set up resolv.conf cp /etc/resolv.conf /vservers/$vserver/etc/resolv.conf # and /etc/hosts for at least localhost [ -f /vservers/$vserver/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > /vservers/$vserver/etc/hosts + } function devel_or_vtest_tools () { @@ -194,6 +271,8 @@ function devel_or_vtest_tools () { pldistro=$1; shift personality=$1; shift + pkg_method=$(package_method $fcdistro) + # check for .pkgs file based on pldistro if [ -n "$VBUILD_MODE" ] ; then pkgsname=devel.pkgs @@ -205,12 +284,34 @@ function devel_or_vtest_tools () { ### install individual packages, then groups # get target arch - use uname -i here (we want either x86_64 or i386) vserver_arch=$($personality vserver $vserver exec uname -i) + # on debian systems we get arch through the 'arch' command + [ "$vserver_arch" = "unknown" ] && vserver_arch=$($personality vserver $vserver exec arch) packages=$(pl_getPackages -a $vserver_arch $fcdistro $pldistro $pkgsfile) groups=$(pl_getGroups -a $vserver_arch $fcdistro $pldistro $pkgsfile) - [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages - [ -n "$groups" ] && $personality vserver $vserver exec yum -y groupinstall $groups + 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) + $personality vserver $vserver exec apt-get update + for package in $packages ; do + $personality vserver $vserver exec apt-get install -y $package + done + ### xxx todo install groups with apt.. + ;; + *) + echo "unknown pkg_method $pkg_method" + ;; + esac + return 0 } @@ -305,6 +406,9 @@ function post_install_myplc () { # turn off regular crond, as plc invokes plc_crond chkconfig crond off + # take care of loginuid in /etc/pam.d + sed -i "s,#*\(.*loginuid.*\),#\1," /etc/pam.d/* + # customize root's prompt cat << PROFILE > /root/.profile export PS1="[$vserver] \\w # " @@ -354,10 +458,13 @@ 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 " echo " typical usage is e.g. --interface eth0:200.150.100.10/24" + echo "With $COMMAND_MYPLC you can give 'none' as the URL, in which case" + echo " myplc.repo does not get created" exit 1 } @@ -377,14 +484,16 @@ function main () { esac VERBOSE= + RESISTANT="" IFNAME="" VSERVER_OPTIONS="" - while getopts "f:d:p:i:v" opt ; do + while getopts "f:d:p:i:rv" opt ; do case $opt in f) fcdistro=$OPTARG;; d) pldistro=$OPTARG;; p) personality=$OPTARG;; i) IFNAME=$OPTARG;; + r) RESISTANT="true";; v) VERBOSE="-v" ;; *) usage ;; esac @@ -427,6 +536,10 @@ function main () { 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 "$@"