From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Wed, 29 Dec 2010 16:49:50 +0000 (-0500)
Subject: Remove ugly hack that breaks su and sudo on upgrades.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Fheads%2F4.2;p=sliceimage.git

Remove ugly hack that breaks su and sudo on upgrades.
---

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 3222324..89a019d 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -39,7 +39,6 @@ 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
@@ -91,12 +90,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %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