josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

set qemu binfmt identifier before using it to avoid uninitialized value error

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2019-10-06 18:37:30 +02:00
parent ec1619d664
commit 86b430190f
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mmdebstrap
View file

@ -2031,11 +2031,16 @@ sub main() {
close $fh; close $fh;
} }
{ {
open my $fh, '-|', '/usr/sbin/update-binfmts', '--display', "qemu-$options->{qemu}" // error "failed to fork(): $!"; if (!exists $deb2qemu->{$nativearch}) {
chomp (my $binfmts = do { local $/; <$fh> }); warning "no mapping from $nativearch to qemu-user binary";
close $fh; } else {
if ($binfmts eq '') { my $binfmt_identifier = 'qemu-' . $deb2qemu->{$nativearch};
warning "qemu-$options->{qemu} is not a supported binfmt name"; open my $fh, '-|', '/usr/sbin/update-binfmts', '--display', $binfmt_identifier // error "failed to fork(): $!";
chomp (my $binfmts = do { local $/; <$fh> });
close $fh;
if ($binfmts eq '') {
warning "$binfmt_identifier is not a supported binfmt name";
}
} }
} }
error "qemu user emulation of $nativearch using binfmt_misc failed"; error "qemu user emulation of $nativearch using binfmt_misc failed";