From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Fri, 27 Jun 2008 20:04:53 +0000 (+0000)
Subject: Try to fix weird state of files causing the install to fail.
X-Git-Tag: VserverReference-4.2-8~2
X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=commitdiff_plain;h=a91ceb1db86ea94158957ba4e666e2075c2a9ae6

Try to fix weird state of files causing the install to fail.
---

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 48641bb..4eafd35 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -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