X-Git-Url: http://rtime.felk.cvut.cz/gitweb/novaboot.git/blobdiff_plain/17e526ccf64b3d4bdb42f029ddc0b1939fe65605..HEAD:/novaboot

diff --git a/novaboot b/novaboot
index 7fa3816..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;
@@ -357,7 +359,7 @@ my $EOF;
 my $last_fn = '';
 my ($modules, $variables, $generated, $copy, $chainload, $continuation) = ([], {}, [], []);
 my $skip_reading = defined($on_opt) || defined($off_opt);
-while (!$skip_reading && ($_ = <>)) {
+while (!$skip_reading && ($_ = <<>>)) {
     if ($ARGV ne $last_fn) { # New script
 	die "Missing EOF in $last_fn" if $file;
 	die "Unfinished line in $last_fn" if $continuation;
@@ -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};