X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=vbuild-init-vserver.sh;h=e391d73f88b49597067bff3fd86bf926eed2c62f;hb=ea2b450a46542d4256e5721b89aa0fa5b17f7572;hp=8d0fe1016666e9373b4a2d74a7b7751c4be81d29;hpb=a60e0d97efa9dca4988c523a1363026b53291fed;p=build.git diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh index 8d0fe101..e391d73f 100755 --- a/vbuild-init-vserver.sh +++ b/vbuild-init-vserver.sh @@ -4,9 +4,13 @@ COMMAND=$(basename $0) DIRNAME=$(dirname $0) -# lst parsing utilities +# pkgs parsing utilities PATH=$(dirname $0):$PATH . build.common +DEFAULT_FCDISTRO=f7 +DEFAULT_PLDISTRO=planetlab +DEFAULT_PERSONALITY=linux32 + function failure () { echo "$COMMAND : Bailing out" exit 1 @@ -76,17 +80,17 @@ function setup_vserver () { fcdistro=$1; shift personality=$1; shift - if [ -d /etc/vservers/$vserver ] ; then + if [ -d /vservers/$vserver ] ; then echo "$COMMAND : vserver $vserver seems to exist - bailing out" exit 1 fi # create it - $personality vserver $VERBOSE $vserver build -m yum -- -d $fcdistro + $personality vserver $VERBOSE $vserver build $VSERVER_OPTIONS -m yum -- -d $fcdistro if [ ! -z "$personality" ] ; then registered_personality=$(grep $personality /etc/vservers/$vserver/personality | wc -l) - if [ $registered_personality -eq 0 -a "$personality" != "linux64" ] ; + if [ $registered_personality -eq 0 -a "$personality" != "linux64" ] ; then echo $personality >> /etc/vservers/$vserver/personality fi fi @@ -129,25 +133,17 @@ function devel_tools () { pldistro=$1; shift personality=$1; shift - # check for .lst file based on pldistro + # check for .pkgs file based on pldistro if [ -n "$VBUILD_MODE" ] ; then - lst=${pldistro}-devel.lst - else - lst=${pldistro}-shell.lst - fi - if [ -f $lst ] ; then - echo "$COMMAND: Using $lst" - elif [ -f $DIRNAME/$lst ] ; then - lst=$DIRNAME/$lst - echo "$COMMAND: Using $lst" + pkgsname=devel.pkgs else - echo "$COMMAND : Cannot locate $lst - exiting" - usage + pkgsname=native-shell.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} $pkgsfile) + groups=$(pl_getGroups ${fcdistro} $pkgsfile) [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages [ -n "$groups" ] && $personality vserver $vserver exec yum -y groupinstall $groups @@ -245,29 +241,20 @@ COMMAND_VBUILD="vbuild-init-vserver.sh" COMMAND_MYPLC="myplc-init-vserver.sh" function usage () { set +x - echo "Usage: $COMMAND_VBUILD [-s|s|p] [-v] vserver-name distribution pldistro [personality]" - echo "Usage: $COMMAND_MYPLC [-s|s|p] [-v] vserver-name distribution pldistro repo-url [personality]" + echo "Usage: $COMMAND_VBUILD [-v] vserver-name [ -- vserver-options ]" + echo "Usage: $COMMAND_MYPLC [-v] 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 "Description:" - echo " This command creates a fresh vserver instance" - echo " . vserver-name : the vserver's name" - echo " . distribution : for creating the root filesystem, e.g. fc6" - echo " . pldistro: e.g. onelab" - echo " . repo-url: for myplc vserver, used to create a yum repository" - echo " . personality: 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 " based on the folowing file for the actual set of packages and groups" - echo " vbuild mode : -devel.lst" - echo " myplc mode : -shell.lst" - echo " (*) post-install : various tunings required, as well as create a build user (vbuild only)" - echo "Options:" - echo " -s : skips the setup phase" - echo " -t : skips the tools phase" - echo " -p : skips the post-install" + 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 : 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 } @@ -286,42 +273,44 @@ function main () { usage ;; esac - DO_SETUP=true - DO_TOOLS=true - DO_POST=true 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 [ -n "$MYPLC_MODE" ] ; then [[ -z "$@" ]] && usage REPO_URL=$1 ; shift fi - if [[ -z "$@" ]] ; then - personality=linux32 - else - personality=$1; shift + + # 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_tools $vserver $fcdistro $pldistro $personality + post_install $vserver $personality }