diff options
| author | Olivier Blin <oblin@mandriva.com> | 2010-03-30 13:26:54 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2010-03-30 13:26:54 +0000 |
| commit | 6cdce3b6b16d7797071f9bbd3e8fb9f01df8250e (patch) | |
| tree | ce2bec066783df6e08541b24abafad01b0f01d7b | |
| parent | 0fe21cbf02725393bab23ca690e1aefc91d97de7 (diff) | |
| download | drakiso-6cdce3b6b16d7797071f9bbd3e8fb9f01df8250e.tar drakiso-6cdce3b6b16d7797071f9bbd3e8fb9f01df8250e.tar.gz drakiso-6cdce3b6b16d7797071f9bbd3e8fb9f01df8250e.tar.bz2 drakiso-6cdce3b6b16d7797071f9bbd3e8fb9f01df8250e.tar.xz drakiso-6cdce3b6b16d7797071f9bbd3e8fb9f01df8250e.zip | |
do not try to use setarch on ARM
| -rw-r--r-- | lib/MDV/Draklive/Utils.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/MDV/Draklive/Utils.pm b/lib/MDV/Draklive/Utils.pm index eba97c7..f98074a 100644 --- a/lib/MDV/Draklive/Utils.pm +++ b/lib/MDV/Draklive/Utils.pm @@ -27,8 +27,10 @@ sub run_ { my $options = ref $_[0] eq 'HASH' ? shift @_ : {}; my @cmd = @_; $options->{timeout} ||= 'never'; - my $targetarch = delete $options->{targetarch}; - unshift @cmd, 'setarch', $targetarch if $targetarch; + if (arch() !~ /^arm/) { + my $targetarch = delete $options->{targetarch}; + unshift @cmd, 'setarch', $targetarch if $targetarch; + } print STDERR "running " . (exists $options->{root} && "(in chroot) ") . join(' ', @cmd) . "\n"; run_program::raw($options, @cmd); } |