]> rtime.felk.cvut.cz Git - novaboot.git/commitdiff
Fix ramdisk timeout in uboot
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 31 Oct 2014 08:40:12 +0000 (09:40 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 31 Oct 2014 08:40:12 +0000 (09:40 +0100)
This happen whan '#' character is a part of U-Boot prompt.

novaboot

index 64ecfd35a0e610ea68e7a6ca77ac3b257fc89cba..54d4b8dae1c2a42347b0ce8a6105419cb4b8cd7f 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -1057,7 +1057,7 @@ if (defined $uboot) {
            die "No '--uboot-addr ramdisk' given" unless $uboot_addr{ramdisk};
            $exp->send("tftpboot $uboot_addr{ramdisk} $prefix$initrd\n");
            $exp->expect(10,
-                        [qr/#/, sub { exp_continue; }],
+                        [qr/##/, sub { exp_continue; }],
                         $uboot_prompt) || die "Initrd load timeout";
        } else {
            $uboot_addr{ramdisk} = '-';