From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 22 Nov 2007 12:01:04 +0000 (+0000)
Subject: temporary : mount/umount /proc : enabled on fc4 as it used to work before - disabled... 
X-Git-Tag: 4.2-rc2~466
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5fa503191d67216c172ea40042d6324f965d4ccf;p=build.git

temporary : mount/umount /proc : enabled on fc4 as it used to work before - disabled on fc6 & higher
---

diff --git a/mkfedora b/mkfedora
index 4a291884..54cedcb0 100755
--- a/mkfedora
+++ b/mkfedora
@@ -189,19 +189,26 @@ 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
-# Mount /proc in reference image
-mkdir -p $vroot/proc
-mount -t proc none $vroot/proc
+## 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
+    mkdir -p $vroot/proc
+    mount -t proc none $vroot/proc
+fi
 
 cleanup ()
 {
-    umount -l $vroot/proc
+    # xxx fixme : do this mount/unmount thing for fc4 only
+    if [ "$releasever" -lt 6 ] ; then
+	umount -l $vroot/proc
+    fi
     umount -l $vroot/dev/shm
     umount -l $vroot/dev/pts
 }