X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=bin%2Fmocksetup;h=b24afbc0d44ce17d7bf4e1bc743dd1420b7bf97a;hb=e9c5c74b8f4cd59588fe518b4753d121b4877536;hp=f972aab2fdadd8806a86e7f91a3ce6a162504266;hpb=dc3afbf1633090347f5f807332407aa0ac3245a5;p=nethome.git

diff --git a/bin/mocksetup b/bin/mocksetup
index f972aab..b24afbc 100755
--- 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