X-Git-Url: http://rtime.felk.cvut.cz/gitweb/novaboot.git/blobdiff_plain/0a26fc0d0c474edbbc900261d85d9c60d0a8294d..f5045133c1c4fdee1e0b3c154775fa6f8763c722:/novaboot diff --git a/novaboot b/novaboot index 0e88881..cd59748 100755 --- a/novaboot +++ b/novaboot @@ -17,7 +17,9 @@ use strict; use warnings; -use warnings (exists $ENV{NOVABOOT_TEST} ? (FATAL => 'all') : ()); +use warnings (exists $ENV{NOVABOOT_TEST} ? + (FATAL => 'all') : + (FATAL => qw(inplace))); # Open warnings in <<>> are fatal use Getopt::Long qw(GetOptionsFromString GetOptionsFromArray); use Pod::Usage; use File::Basename; @@ -1293,8 +1295,9 @@ if (defined $uboot) { die "No '--uboot-addr kernel' given" unless $uboot_addr{kernel}; $exp->send("tftpboot $uboot_addr{kernel} $prefix$kbin\n"); $exp->expect(15, - [qr/##/, sub { exp_continue; }], - $uboot_prompt) || die "Kernel load: " . ($! || "timeout"); + $uboot_prompt, + [qr/#/, sub { exp_continue; }] + ) || die "Kernel load: " . ($! || "timeout"); } if (defined $dtb) { die "No '--uboot-addr fdt' given" unless $uboot_addr{fdt};