From: Jan Kratochvil Date: Sun, 27 Feb 2011 10:11:08 +0000 (+0100) Subject: +f14 compatibility X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=6e5c09fdcc3841ddbd3e1b67b29987923f866abb +f14 compatibility --- diff --git a/bin/mockrun b/bin/mockrun index 8163f24..e2a8f3f 100755 --- a/bin/mockrun +++ b/bin/mockrun @@ -1,20 +1,18 @@ #! /usr/bin/perl -T -# $Id$ +# $Id: mockrun,v 1.2 2009/10/03 17:45:41 jkratoch Exp $ use strict; use warnings; use English; die "Need [/var/lib/mock/] []" if @ARGV<1; local $_=shift; -$EUID==0 or die "Need SUID"; -$UID = $EUID; delete @ENV{qw(PATH BASH_ENV)}; tr{/}{}s; s{^/var/lib/mock/}{}; my $safe="([-_a-z0-9]+)"; $_=(/$safe/)[0]; my $rpath="/var/lib/mock/$_/root"; -system "/usr/local/sbin/mocksetup -s $_" and die "mocksetup $_"; +system "sudo /usr/local/sbin/mocksetup -s $_" and die "sudo mocksetup $_"; -e "$rpath/MOCK" or die "mocksetup $_ and still no $rpath/MOCK"; my $user=$ENV{"USER"}; $user=($user=~/$safe/)[0]; @@ -24,7 +22,7 @@ $user=($user=~/$safe/)[0]; # my @l=(qw(mock -r),$_,qw(--shell)); my $mock="/usr/bin/setarch"; my $arch=(/-(i386|x86_64)(?:-.*)?$/)[0] or die; -my @l=("setarch",$arch,"/usr/sbin/chroot",$rpath); +my @l=("setarch",$arch,"/usr/bin/sudo","/usr/sbin/chroot",$rpath); # Untaint @ARGV->@args. my $args="";