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
Try to fix weird state of files causing the install to fail.
[sliceimage.git]
/
vserver-reference.spec
diff --git
a/vserver-reference.spec
b/vserver-reference.spec
index
5839317
..
4eafd35
100644
(file)
--- a/
vserver-reference.spec
+++ b/
vserver-reference.spec
@@
-7,7
+7,7
@@
%define name vserver
%define version 4.2
%define name vserver
%define version 4.2
-%define taglevel
6
+%define taglevel
7
# pldistro already in the rpm name
#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
# pldistro already in the rpm name
#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@
-39,6
+39,7
@@
Summary: VServer reference image
Group: Applications/System
AutoReqProv: no
Requires: util-vserver, e2fsprogs, yum
Group: Applications/System
AutoReqProv: no
Requires: util-vserver, e2fsprogs, yum
+Requires(pre): util-vserver-core, findutils
%description %{slicefamily}
This package creates the virtual server (VServer) reference image used
%description %{slicefamily}
This package creates the virtual server (VServer) reference image used
@@
-99,11
+100,10
@@
fi
%define vcached_pid /var/run/vcached.pid
%define vcached_pid /var/run/vcached.pid
+# XXX: UGLY HACK
%pre %{slicefamily}
%pre %{slicefamily}
-rm -rf /vservers/.vref/%{slicefamily}
-
-%pre systemslices-%{slicefamily}
-rm -rf /vservers/.vstub/%{slicefamily}
+test -d /vservers/.vref/%{slicefamily} && \
+ find /vservers/.vref/%{slicefamily} -print0 | xargs -0 setattr --~iunlink
%post %{slicefamily}
chkconfig --add vserver-reference
%post %{slicefamily}
chkconfig --add vserver-reference
@@
-118,6
+118,9
@@
H=$((24 * $RANDOM / 32768))
sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
%changelog
sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
%changelog
+* Fri Jun 27 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - VserverReference-4.2-7
+- Let rpm remove the files.
+
* Thu Apr 24 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-6
- empty change, this should *not* be a noarch package
* Thu Apr 24 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-6
- empty change, this should *not* be a noarch package