X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=4eafd355229fc6875fac7b092e532b3209ad7cf6;hb=a91ceb1db86ea94158957ba4e666e2075c2a9ae6;hp=720be64edb53b6e53dda0e9e894cabbf50b933bb;hpb=2ca596c520d5ddfb749ba45455c22481675f06a0;p=sliceimage.git diff --git a/vserver-reference.spec b/vserver-reference.spec index 720be64..4eafd35 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -7,7 +7,7 @@ %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}} @@ -39,6 +39,7 @@ Summary: VServer reference image 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 @@ -99,6 +100,11 @@ fi %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 @@ -112,6 +118,9 @@ H=$((24 * $RANDOM / 32768)) sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference %changelog +* Fri Jun 27 2008 Daniel Hokka Zakrisson - VserverReference-4.2-7 +- Let rpm remove the files. + * Thu Apr 24 2008 Thierry Parmentelat - VserverReference-4.2-6 - empty change, this should *not* be a noarch package