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,
# Set the attribute to unlink so vclone does the right thing wrt to
# conserving space by linking and not copying unified files.
-find "$__DEFAULT_VSERVERDIR/.vref/default" -type f -print0 | xargs -0 setattr --iunlink
+find "$__DEFAULT_VSERVERDIR/.vref/*" -type f -print0 | xargs -0 setattr --iunlink
# Build reference images for system slices
-for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*.cloned ; do
+# xxx if several instances of systemslices get installed, only one gets instanciated
+for systemvserver in "$__DEFAULT_VSERVERDIR/.vstub/"*/*.cloned ; do
NAME=$(basename $systemvserver .cloned)
+ DIR=$(dirname $systemvserver)
# Copy base reference image
if [ ! -d "$__DEFAULT_VSERVERDIR/.vref/$NAME" ] ; then
# build the systemvserver from the one it was originally cloned from
TYPE=$(cat $systemvserver)
REF="$__DEFAULT_VSERVERDIR/.vref/$TYPE"
- "$_VCLONE" "$REF"/ "$TMP"/
- RETVAL=$?
+ if [ -d "$REF" ] ; then
+ "$_VCLONE" "$REF"/ "$TMP"/
+ RETVAL=$?
+ else
+ RETVAL=1
+ fi
# merge the stub with the reference to get the system vserver
if [ $RETVAL -eq 0 ] ; then
- (cd "$__DEFAULT_VSERVERDIR/.vstub/$NAME"/ && find . | cpio -m -d -u -p "$TMP"/)
+ (cd "$DIR/$NAME"/ && find . | cpio -m -d -u -p "$TMP"/)
RETVAL=$?
fi
mv "$TMP" "$__DEFAULT_VSERVERDIR/.vref/$NAME"
success >&3 2>&4
else
+ rm -rf "$TMP"
failure >&3 2>&4
fi
echo >&3 2>&4
#
%define url $URL$
+%define slicefamily %{pldistro}-%{distroname}-%{_arch}
+
%define name vserver
%define version 4.2
%define taglevel 2
-%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+# pldistro already in the rpm name
+#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release %{taglevel}%{?date:.%{date}}
-Summary: VServer reference image
+Summary: VServer reference image for slice family %{slicefamily}
Name: %{name}
Version: %{version}
Release: %{release}
%description
This package does not really exist.
-%package reference
+%package %{slicefamily}
Summary: VServer reference image
Group: Applications/System
AutoReqProv: no
Requires: util-vserver, e2fsprogs, yum
Requires(pre): /bin/sh, coreutils
-%description reference
+%description %{slicefamily}
This package creates the virtual server (VServer) reference image used
as the installation base for new PlanetLab slivers.
-%package system-packages
+%package systemslices-%{slicefamily}
Summary: System slice packages
Group: Applications/System
-Requires: vserver-reference >= %{version}-%{release}
+Requires: vserver-%{slicefamily} >= %{version}-%{release}
AutoReqProv: no
-%description system-packages
+%description systemslices-%{slicefamily}
This package installs the RPMS necessary to create system ("root
resource") slices from the virtual server (VServer) reference image.
%build
pushd VserverReference
-./build.sh %{pldistro}
+./build.sh %{pldistro} %{slicefamily}
popd
%install
chown -h -R $SUDO_USER %{_rpmdir}/%{_arch}
fi
-%files reference
+%files %{slicefamily}
%defattr(-,root,root)
%{_initrddir}/vserver-reference
%{_sysconfdir}/cron.d/vserver-reference
%{_sysconfdir}/logrotate.d/vserver-reference
-/vservers/.vref/default
+/vservers/.vref/%{slicefamily}
-%files system-packages
+%files systemslices-%{slicefamily}
%defattr(-,root,root)
/vservers/.vstub
%define vcached_pid /var/run/vcached.pid
-%pre reference
+%pre %{slicefamily}
# Stop vcached
if [ -r %{vcached_pid} ] ; then
kill $(cat %{vcached_pid})
# Allow vcached to run again
rm -f %{vcached_pid}
-%post reference
+%post %{slicefamily}
chkconfig --add vserver-reference
chkconfig vserver-reference on
+# store the default for nodemanager
+[ -f /etc/planetlab/defaultvref ] || echo %{slicefamily} > /etc/planetlab/defaultvref
[ "$PL_BOOTCD" = "1" ] || service vserver-reference start
# Randomize daily run time