uboot: Do not analyze expanded kernel command line

[novaboot.git] / novaboot

diff --git a/novaboot b/novaboot
index 42743a77489c09cd67d6b842663fd59e770a8bee..5f4cfe3fdc299e911bcc49363702107f9821a6df 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -1068,14 +1068,9 @@ if (defined $uboot) {
        } else {
            $uboot_addr{ramdisk} = '-';
        }
-       $exp->send("echo $kcmd\n");
-       $exp->expect(1, '-re', qr{echo .*\n(.*)\n$uboot_prompt})  || die "Command line test timeout";
-       my $args = ($exp->matchlist)[0];
-       if ($args =~ /^setenv\s+bootargs/) {
-           $exp->send("$args\n");
-       } else {
-           $exp->send("setenv bootargs $kcmd\n");
-       }
+
+       $kcmd //= '';
+       $exp->send("setenv bootargs $kcmd\n");
        $exp->expect(5, $uboot_prompt)  || die "U-Boot prompt timeout";
 
        $uboot_cmd //= $variables->{UBOOT_CMD} // 'bootm $kernel_addr $ramdisk_addr $fdt_addr';