X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-init-vserver.sh;h=cc7b10b42e416ad2fc55a0beec008c8360713b1e;hb=46cb991a23c0e0d7b79f04833e68456a77c53280;hp=fe3bb720ca8441c5e54ef066eb3e80d49ad85b1b;hpb=4287f053b717c863b4139dbe0170617abb19513b;p=build.git diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh index fe3bb720..cc7b10b4 100755 --- a/vbuild-init-vserver.sh +++ b/vbuild-init-vserver.sh @@ -2,10 +2,15 @@ # -*-shell-*- COMMAND=$(basename $0) +DIRNAME=$(dirname $0) -# lst parsing utilities +# pkgs parsing utilities PATH=$(dirname $0):$PATH . build.common +DEFAULT_FCDISTRO=f8 +DEFAULT_PLDISTRO=planetlab +DEFAULT_PERSONALITY=linux32 + function failure () { echo "$COMMAND : Bailing out" exit 1 @@ -25,9 +30,15 @@ function configure_yum_in_vserver () { cd /etc/vservers/.distributions/${fcdistro} if [ -f yum/yum.conf ] ; then echo "Initializing yum.conf in $vserver from $(pwd)/yum" - cp yum/yum.conf /vservers/$vserver/etc/yum.conf + 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 + + # post process the various @...@ variables from this yum.conf file. else - echo "Cannot initialize yum.conf in $vserver - using $fcdistro default" + echo "Using $fcdistro default for yum.conf" fi if [ -d yum.repos.d ] ; then @@ -37,6 +48,25 @@ function configure_yum_in_vserver () { else echo "Cannot initialize yum.repos.d in $vserver" fi + + if [ -n "$MYPLC_MODE" ] ; 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 "exclude=kernel* ulogd iptables" >> $i + done + # the build repo is not signed at this stage + cat > /vservers/$vserver/etc/yum.repos.d/myplc.repo <> /etc/vservers/$vserver/personality + if [ -f "/etc/vservers/$vserver/personality" ] ; then + registered_personality=$(grep $personality /etc/vservers/$vserver/personality | wc -l) + else + registered_personality=0 + fi + if [ $registered_personality -eq 0 -a "$personality" != "linux64" ] ; then + echo $personality >> /etc/vservers/$vserver/personality + fi fi - # 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 + 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 + 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 + fi + + $personality vyum $vserver -- -y install yum + # ditto + for i in 1 2 3 4 5 ; do + $personality vserver $VERBOSE $vserver pkgmgmt internalize && break || true + echo "Waiting for one minute" + sleep 60 + done # start the vserver so we can do the following operations - if [ $CLONED -eq 0 ] ; then - $personality vyum $vserver -- -y install yum - $personality vserver $VERBOSE $vserver pkgmgmt internalize - fi $personality vserver $VERBOSE $vserver start - $personality vserver $VERBOSE $vserver exec rm -f /var/lib/rpm/__db* + $personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*" $personality vserver $VERBOSE $vserver exec rpm --rebuilddb - configure_yum_in_vserver $vserver $fcdistro + # minimal config in the vserver for yum to work + configure_yum_in_vserver $vserver $fcdistro # set up resolv.conf cp /etc/resolv.conf /vservers/$vserver/etc/resolv.conf } -function devel_tools () { +function devel_or_vtest_tools () { set -x set -e @@ -104,18 +159,17 @@ function devel_tools () { pldistro=$1; shift personality=$1; shift - # check for .lst file based on pldistro - lst=${pldistro}-devel.lst - if [ -f $lst ] ; then - echo "$COMMAND: Using $lst" + # check for .pkgs file based on pldistro + if [ -n "$VBUILD_MODE" ] ; then + pkgsname=devel.pkgs else - echo "$COMMAND : Cannot locate $lst - exiting" - usage + pkgsname=vtest.pkgs fi + pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $pkgsname) # install individual packages, then groups - packages=$(pl_getPackages2 ${fcdistro} $lst) - groups=$(pl_getGroups2 ${fcdistro} $lst) + packages=$(pl_getPackages $fcdistro $pldistro $pkgsfile) + groups=$(pl_getGroups $fcdistro $pldistro $pkgsfile) [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages [ -n "$groups" ] && $personality vserver $vserver exec yum -y groupinstall $groups @@ -123,6 +177,14 @@ function devel_tools () { } function post_install () { + if [ -n "$VBUILD_MODE" ] ; then + post_install_vbuild "$@" + else + post_install_myplc "$@" + fi +} + +function post_install_vbuild () { set -x set -e @@ -140,7 +202,7 @@ function post_install () { done # create symlink for /dev/fd - ln -fs /proc/self/fd /dev/fd + [ ! -e "/dev/fd" ] && ln -s /proc/self/fd /dev/fd # modify /etc/rpm/macros to not use /sbin/new-kernel-pkg sed -i 's,/sbin/new-kernel-pkg:,,' /etc/rpm/macros @@ -154,6 +216,11 @@ function post_install () { fi fi + # customize root's prompt + cat << PROFILE > /root/.profile +export PS1="[$vserver] \\w # " +PROFILE + uid=2000 gid=2000 @@ -177,29 +244,46 @@ EOF } +function post_install_myplc () { + set -x + set -e + trap failure ERR INT + + vserver=$1; shift + personality=$1; shift + +# be careful to backslash $ in this, otherwise it's the root context that's going to do the evaluation + cat << EOF | $personality vserver $VERBOSE $vserver exec bash -x + + # create symlink for /dev/fd + [ ! -e "/dev/fd" ] && ln -s /proc/self/fd /dev/fd + + # customize root's prompt + cat << PROFILE > /root/.profile +export PS1="[$vserver] \\w # " +PROFILE + +EOF +} + +COMMAND_VBUILD="vbuild-init-vserver.sh" +COMMAND_MYPLC="vtest-init-vserver.sh" function usage () { set +x - echo "Usage: $COMMAND [-s] [-p] [-v] vserver-name distribution pldistro [personality]" + echo "Usage: $COMMAND_VBUILD [options] vserver-name [ -- vserver-options ]" + echo "Usage: $COMMAND_MYPLC [options] vserver-name repo-url [ -- vserver-options ]" echo "Requirements: you need to have a vserver-compliant kernel," - echo " as well as the util-vserver RPM installed" + echo " as well as the util-vserver RPM installed" echo "Description:" - echo " This command creates a fresh vserver instance, with the specified name" - echo " The root filesystem is created from the specified distribution, e.g. fc6" - echo " The third argument denotes a pldistro, e.g. onelab" - echo " The last, optional, argument defaults to linux32" - echo "This is done in three steps" - echo " (*) setup phase : vserver creation, yum internalization and config (from /etc/vservers)" - echo " (*) tools install : the tools required for building are installed" - echo " to this end we search for a .lst file that specifies the pkgs & groups" - echo " assuming the above that pldistro is onelab:" - echo " (*) we first check for onelab-devel-fc6.lst" - echo " (*) and then for onelab-devel.lst" - echo " (*) post-install : create a build user, + various tunings required" - echo "Options:" - echo " -s : skips the setup phase" - echo " -t : skips the tools phase" - echo " -p : skips the post-install" - echo " -v : passes -v to calls to vserver" + echo " This command creates a fresh vserver instance, for building, or running, myplc" + echo "Supported options" + echo " -f fcdistro - for creating the root filesystem - defaults to $DEFAULT_FCDISTRO" + echo " -d pldistro - defaults to $DEFAULT_PLDISTRO" + echo " -p personality - defaults to $DEFAULT_PERSONALITY" + 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" exit 1 } @@ -209,38 +293,53 @@ function main () { set -e trap failure ERR INT - DO_SETUP=true - DO_TOOLS=true - DO_POST=true + case "$COMMAND" in + $COMMAND_VBUILD) + VBUILD_MODE=true ;; + $COMMAND_MYPLC) + MYPLC_MODE=true;; + *) + usage ;; + esac + VERBOSE= - while getopts "stpvh" opt ; do + while getopts "f:d:p:v" opt ; do case $opt in - s) DO_SETUP="" ;; - t) DO_TOOLS="" ;; - p) DO_POST="" ;; + f) fcdistro=$OPTARG;; + d) pldistro=$OPTARG;; + p) personality=$OPTARG;; v) VERBOSE="-v" ;; - h|*) usage ;; + *) usage ;; esac done shift $(($OPTIND - 1)) - + + # parse fixed arguments [[ -z "$@" ]] && usage vserver=$1 ; shift - [[ -z "$@" ]] && usage - fcdistro=$1 ; shift - [[ -z "$@" ]] && usage - pldistro=$1 ; shift - if [[ -z "$@" ]] ; then - personality=linux32 - else - personality=$1; shift + if [ -n "$MYPLC_MODE" ] ; then + [[ -z "$@" ]] && usage + REPO_URL=$1 ; shift + fi + + # parse vserver options + if [[ -n "$@" ]] ; then + if [ "$1" == "--" ] ; then + shift + VSERVER_OPTIONS="$@" + else + usage + fi fi - [[ -n "$@" ]] && usage - [ -n "$DO_SETUP" ] && setup_vserver $vserver $fcdistro $personality - [ -n "$DO_TOOLS" ] && devel_tools $vserver $fcdistro $pldistro $personality - [ -n "$DO_POST" ] && post_install $vserver $personality + [ -z "$fcdistro" ] && fcdistro=$DEFAULT_FCDISTRO + [ -z "$pldistro" ] && pldistro=$DEFAULT_PLDISTRO + [ -z "$personality" ] && personality=$DEFAULT_PERSONALITY + + setup_vserver $vserver $fcdistro $personality + devel_or_vtest_tools $vserver $fcdistro $pldistro $personality + post_install $vserver $personality }