bin/mocksetup: /var/cache/mock: -u: Fix.

[nethome.git] / bin / mocksetup

diff --git a/bin/mocksetup b/bin/mocksetup
index f972aab..b24afbc 100755 (executable)
--- a/bin/mocksetup
+++ b/bin/mocksetup
@@ -154,23 +154,27 @@ for r in $l;do
     ln -s /proc/self/fd $rpath/dev/fd
   fi
 
-  # Must be before umount of /hdd
-  c="umount $rpath/var/cache/yum"
-  if $c 2>&1|grep -v ': not \(mounted\|found\)$';then
-    echo $c
-  fi
-  if ! $u;then
-    if [ -d /var/cache/mock/$r/yum_cache ];then
-      cr=$r
-    else
-      cr=`echo $r|sed 's/-[^-]*$//'`
+  # Must be before umount of /quad
+  for cache in yum dnf;do
+    c="umount $rpath/var/cache/$cache"
+    if $c 2>&1|grep -v ': not \(mounted\|found\)$';then
+      echo $c
     fi
-    c="mount --bind /var/cache/mock/$cr/yum_cache $rpath/var/cache/yum"
-    echo $c; $c
-  fi
+    if ! $u;then
+      if [ -d /var/cache/mock/$r/${cache}_cache ];then
+       cr=$r
+      else
+       cr=`echo $r|sed 's/-[^-]*$//'`
+      fi
+      if [ -d /var/cache/mock/$cr/${cache}_cache ];then
+       c="mount --bind /var/cache/mock/$cr/${cache}_cache $rpath/var/cache/${cache}"
+       echo $c; $c
+      fi
+    fi
+  done
 
-  mkdir -p $rpath/unsafe $rpath/hdd
-  for dir in /home /usr/local/bin /proc /sys /root /unsafe /hdd;do
+  mkdir -p $rpath/quad
+  for dir in /home /usr/local/bin /proc /sys /root /quad;do
     c="umount $rpath$dir"
     if $c 2>&1|grep -v ': not \(mounted\|found\)$';then
       echo $c