X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=40328d55cf5c61e95fdff8e774a55665fcd5b0ac;hb=34c50eb43300121f3d4b8f9af3250c9934442296;hp=ff6fd931af98f2d4c3a6d39893019ee11982692e;hpb=97e9233bcfe842c2604273dbeba74460002412fd;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index ff6fd93..40328d5 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -103,8 +103,9 @@ EOF
 # Prevent all locales from being installed in reference image
 mkdir -p %{installroot}/etc/rpm
 cat > %{installroot}/etc/rpm/macros <<EOF
-%_install_langs en_US:en
-%_excludedocs 1
+%%_install_langs en_US:en
+%%_excludedocs 1
+%%__file_context_path /dev/null
 EOF
 
 # Initialize RPM database in reference image
@@ -119,6 +120,9 @@ yum -c ./yum.conf \
 --installroot=%{installroot} \
 -y groupinstall VServer
 
+# Freshen any new RPMs
+find %{_topdir}/RPMS -type f | xargs rpm --root %{installroot} -F
+
 # Clean up /dev in reference image
 MAKEDEV
 
@@ -166,6 +170,12 @@ if [ -n "$SUDO_UID" ] ; then
     done
 fi
 
+%pre
+# 1 = install, 2 = upgrade/reinstall
+if [ $1 -eq 2 ] ; then
+    chattr -R -i %{vrefdir}
+fi
+
 %post
 # Copy configuration files from host to reference image
 for file in /etc/hosts /etc/resolv.conf /etc/yum.conf ; do