%define name vserver
-%define version 4.0
+%define version 4.1
%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Vendor: PlanetLab
%build
pushd vserver-reference
-./build.sh -r 4
+./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { print $4 } ' /etc/fedora-release || echo 4)
./system-packages.sh
popd
# If run under sudo
if [ -n "$SUDO_USER" ] ; then
# Allow user to delete the build directory
- chown -R $SUDO_USER .
+ chown -h -R $SUDO_USER .
# Some temporary cdroot files like /var/empty/sshd and
# /usr/bin/sudo get created with non-readable permissions.
find . -not -perm +0600 -exec chmod u+rw {} \;
# Allow user to delete the built RPM(s)
- chown -R $SUDO_USER %{_rpmdir}/%{_arch}
+ chown -h -R $SUDO_USER %{_rpmdir}/%{_arch}
fi
%files reference
%defattr(-,root,root)
%{_initrddir}/vserver-reference
%{_sysconfdir}/cron.d/vserver-reference
-/vservers/vserver-reference
+/vservers/.vref/default
%files system-packages
%defattr(-,root,root)
# vcached will clean up .vtmp later
mkdir -p /vservers/.vtmp
-if [ -d /vservers/vserver-reference ] ; then
- mv /vservers/vserver-reference /vservers/.vtmp/vserver-reference.$RANDOM
+if [ -d /vservers/.vref ] ; then
+ mv /vservers/.vref /vservers/.vtmp/.vref.$RANDOM
fi
if [ -d /vservers/.vcache ] ; then
mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM