From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 22 Nov 2007 19:49:40 +0000 (+0000)
Subject: re-enables Marc's patch on fc4 as it seems to work
X-Git-Tag: 4.2-rc2~464
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=712e8c9831bb5f8bab063ac9c8aeb331820efe41;p=build.git

re-enables Marc's patch on fc4 as it seems to work
without it, filesystem does not get installed on fc4 anyway
---

diff --git a/mkfedora b/mkfedora
index 54cedcb0..e698017f 100755
--- a/mkfedora
+++ b/mkfedora
@@ -189,16 +189,15 @@ set -e
 mount -t devpts none $vroot/dev/pts
 mount -t tmpfs none $vroot/dev/shm
 
-## make rpms ignore installing stuff to /proc
-#mkdir -p $vroot/etc/rpm
-## Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
-## you have to use at least one language beside 'C'
-#echo "%_install_langs         C:de:en:es:fr" > $vroot/etc/rpm/macros
-#echo "%_netsharedpath /proc" >> $vroot/etc/rpm/macros
-
 # xxx fixme : do this mount/unmount thing for fc4 only
 if [ "$releasever" -lt 6 ] ; then
-   # Mount /proc in reference image
+    ## make rpms ignore installing stuff to /proc
+    mkdir -p $vroot/etc/rpm
+    # Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
+    # you have to use at least one language beside 'C'
+    echo "%_install_langs         C:de:en:es:fr" > $vroot/etc/rpm/macros
+    echo "%_netsharedpath /proc" >> $vroot/etc/rpm/macros
+    # Mount /proc in reference image
     mkdir -p $vroot/proc
     mount -t proc none $vroot/proc
 fi