X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fmocksetup;h=86170c0277e78237d6baa3fac4b60dc649bf641e;hp=9d9d3292dba8fc5c6e31dd8c38ea20ca81bd0f38;hb=a62e533b639081adde8899e3f0acfe6834ef825f;hpb=6fb37674462f4ce0d58591f11904e22130319e91 diff --git a/bin/mocksetup b/bin/mocksetup index 9d9d329..86170c0 100755 --- a/bin/mocksetup +++ b/bin/mocksetup @@ -85,7 +85,7 @@ for r in $l;do echo $c done - for dir in /home /usr/local/bin /dev /proc /sys;do + for dir in /home /usr/local/bin /dev /proc /sys /root;do c="umount $rpath$dir" while $c 2>&1|grep -v ': not mounted$';do echo $c @@ -107,7 +107,12 @@ for r in $l;do echo $c done if ! $u;then - c="mount --bind /var/cache/mock/$r/yum_cache $rpath/var/cache/yum" + if [ -d /var/cache/mock/$r/yum_cache ];then + cr=$r + else + cr=`echo $r|sed 's/-[^-]*$//'` + fi + c="mount --bind /var/cache/mock/$cr/yum_cache $rpath/var/cache/yum" echo $c; $c fi @@ -121,6 +126,20 @@ for r in $l;do ln -s ../../src/debug $rpath/usr/local/src/debug fi + rm -f $rpath/usr/local/share/gdb + if ! $u;then + mkdir -p $rpath/usr/local/share + ln -s ../../share/gdb $rpath/usr/local/share/gdb + fi + + # Old systems incl. RHEL-6 do not feature it. + if [ -d $rpath/etc/sudoers.d ];then + rm -f $rpath/etc/sudoers.d/inteltest + if ! $u;then + ln /etc/sudoers.d/inteltest $rpath/etc/sudoers.d/inteltest + fi + fi + if ! $u;then echo $r >$rpath/MOCK fi