git://git.onelab.eu
/
sliceimage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[sliceimage.git]
/
vserver-reference.spec
diff --git
a/vserver-reference.spec
b/vserver-reference.spec
index
86d4e09
..
8c53b5d
100644
(file)
--- a/
vserver-reference.spec
+++ b/
vserver-reference.spec
@@
-1,6
+1,6
@@
%define name vserver-reference
%define version 3.1
%define name vserver-reference
%define version 3.1
-%define release
1.planetlab
%{?date:.%{date}}
+%define release
2%{?pldistro:.%{pldistro}}
%{?date:.%{date}}
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
@@
-33,11
+33,15
@@
RPM_BUILD_DIR=$RPM_BUILD_DIR ./build.sh
%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 %{name}.init $RPM_BUILD_ROOT/%{_initrddir}/%{name}
%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 %{name}.init $RPM_BUILD_ROOT/%{_initrddir}/%{name}
+install -D -m 644 vserver-reference.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference
find vservers/vserver-reference | cpio -p -d -u $RPM_BUILD_ROOT/
# If run under sudo, allow user to delete the build directory
if [ -n "$SUDO_USER" ] ; then
chown -R $SUDO_USER .
find vservers/vserver-reference | cpio -p -d -u $RPM_BUILD_ROOT/
# If run under sudo, allow user to delete the build directory
if [ -n "$SUDO_USER" ] ; then
chown -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 {} \;
fi
%clean
fi
%clean
@@
-51,6
+55,7
@@
fi
%files
%defattr(-,root,root)
%{_initrddir}/%{name}
%files
%defattr(-,root,root)
%{_initrddir}/%{name}
+%{_sysconfdir}/cron.d/vserver-reference
/vservers/vserver-reference
%define vcached_pid /var/run/vcached.pid
/vservers/vserver-reference
%define vcached_pid /var/run/vcached.pid
@@
-60,7
+65,7
@@
fi
if [ -r %{vcached_pid} ] ; then
kill $(cat %{vcached_pid})
fi
if [ -r %{vcached_pid} ] ; then
kill $(cat %{vcached_pid})
fi
-
touch
%{vcached_pid}
+
echo $$ >
%{vcached_pid}
# vcached will clean up .vtmp later
mkdir -p /vservers/.vtmp
# vcached will clean up .vtmp later
mkdir -p /vservers/.vtmp
@@
-79,6
+84,11
@@
chkconfig --add %{name}
chkconfig %{name} on
[ "$PL_BOOTCD" = "1" ] || service vserver-reference start
chkconfig %{name} on
[ "$PL_BOOTCD" = "1" ] || service vserver-reference start
+# Randomize daily run time
+M=$((60 * $RANDOM / 32768))
+H=$((24 * $RANDOM / 32768))
+sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
+
%changelog
* Tue Sep 1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
- Pre-package vserver-reference instead of building it on nodes
%changelog
* Tue Sep 1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
- Pre-package vserver-reference instead of building it on nodes