git://git.onelab.eu
/
vserver-reference.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The scriptlet should succeed if the directory does not exist.
[vserver-reference.git]
/
vserver-reference.spec
diff --git
a/vserver-reference.spec
b/vserver-reference.spec
index
48641bb
..
d0d4156
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
7
+%define taglevel
8
# 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,6
+100,12
@@
fi
%define vcached_pid /var/run/vcached.pid
%define vcached_pid /var/run/vcached.pid
+# XXX: UGLY HACK
+%pre %{slicefamily}
+test -d /vservers/.vref/%{slicefamily} && \
+ find /vservers/.vref/%{slicefamily} -print0 | xargs -0 setattr --~iunlink
+:
+
%post %{slicefamily}
chkconfig --add vserver-reference
chkconfig vserver-reference on
%post %{slicefamily}
chkconfig --add vserver-reference
chkconfig vserver-reference on
@@
-112,6
+119,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-8
+- Unset the immutable and iunlink bits to make sure we can install the package.
+
* Fri Jun 27 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - VserverReference-4.2-7
- Let rpm remove the files.
* Fri Jun 27 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - VserverReference-4.2-7
- Let rpm remove the files.