attempt to solve mount (/proc /dev/pts) issues :

[build.git] / mkfedora

diff --git a/mkfedora b/mkfedora
index 09fb7cc..b238215 100755 (executable)
--- a/mkfedora
+++ b/mkfedora
@@ -193,25 +193,22 @@ set -e
 mount -t devpts none $vroot/dev/pts
 mount -t tmpfs none $vroot/dev/shm
 
-# xxx fixme : do this mount/unmount thing for fc4 only
-if [ "$releasever" -lt 6 ] ; then
-    ## 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
+## 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:/dev/pts" >> $vroot/etc/rpm/macros
+# append to the vserver's rpm macros
+echo "%_install_langs C:de:en:es:fr" > /etc/rpm/macros
+echo "%_netsharedpath /proc:/dev/pts" >> /etc/rpm/macros
+# Mount /proc in reference image
+mkdir -p $vroot/proc
+mount -t proc none $vroot/proc
 
 cleanup ()
 {
-    # xxx fixme : do this mount/unmount thing for fc4 only
-    if [ "$releasever" -lt 6 ] ; then
-       umount -l $vroot/proc
-    fi
+    umount -l $vroot/proc
     umount -l $vroot/dev/shm
     umount -l $vroot/dev/pts
 }