From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 4 Dec 2007 05:43:51 +0000 (+0000)
Subject: checking whether there is a real need to alter /etc/rpm/macros
X-Git-Tag: 4.2-rc2~387
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6df544840ffb9ec056cc46b54d6d2249fafde103;p=build.git

checking whether there is a real need to alter /etc/rpm/macros
---

diff --git a/mkfedora b/mkfedora
index 6f01478c..d3909012 100755
--- a/mkfedora
+++ b/mkfedora
@@ -193,15 +193,16 @@ set -e
 ## make rpms ignore installing stuff to special fs entries like /proc
 # Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
 # you have to use at least one language beside 'C'
-# xxx fixme - this must be reviewed once we get the stuff running
-cat > /etc/rpm/macros <<EOF
+mkdir -p $vroot/etc/rpm
+cat > $vroot/etc/rpm/macros <<EOF
 %_install_langs C:de:en:es:fr
 %_netsharedpath /proc:/dev/pts
 %_excludedocs yes
 EOF
-# copy to the vserver's rpm macros
-mkdir -p $vroot/etc/rpm
-cp /etc/rpm/macros $vroot/etc/rpm/macros
+### Checking whether this is really needed
+### # copy to the vserver's rpm macros
+### # xxx fixme - this must be reviewed once we get the stuff running
+### cp $vroot/etc/rpm/macros /etc/rpm/macros 
 
 # Mount in reference image
 mount -t devpts none $vroot/dev/pts