X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=blobdiff_plain;f=build.sh;fp=build.sh;h=c5cfcb752809659ba37111ff826bc8e47c396f8a;hp=c4c117e61e1c78269147f84a2147925e64b45a09;hb=2a48e93aa6f87832e212419f1268c78f06d4fb23;hpb=ea0f8131c3a4fd50c7c72d0a506533167ac51648 diff --git a/build.sh b/build.sh index c4c117e..c5cfcb7 100755 --- a/build.sh +++ b/build.sh @@ -37,22 +37,21 @@ pl_process_fedora_options $@ shiftcount=$? shift $shiftcount -# pldistro expected as $1 - defaults to planetlab +# pldistro expected as $1 pldistro=$1 ; shift +# The vserver reference name - this comes from spec's slicefamily +vrefname=$1; shift # Do not tolerate errors set -e # Path's to the vserver references images and stubs vrefdir=$PWD/vservers/.vref -vstubdir=$PWD/vservers/.vstub - -# XXX: The vserver reference name should be passed in as an argument -# rather than being hardcoded. -vrefname=default +vref=${vrefdir}/${vrefname} +# stubs are created in a subdir per slicefamily +vstubdir=$PWD/vservers/.vstub/${vrefname} # Make /vservers and default vserver reference image -vref=${vrefdir}/${vrefname} install -d -m 755 ${vref} # Some of the PlanetLab RPMs attempt to (re)start themselves in %post,