From 3842e0f745298f09aeb7bc55f894d184636badb7 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Tue, 10 Feb 2015 14:58:38 +0100 Subject: [PATCH] Do not run --uboot-cmd if it is empty string --- novaboot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/novaboot b/novaboot index 7603aa6..a7c1b9b 100755 --- a/novaboot +++ b/novaboot @@ -1130,8 +1130,8 @@ if (defined $uboot) { $exp->expect(5, $uboot_prompt) || die "U-Boot prompt timeout"; } - if (!$variables->{NO_BOOT}) { - $uboot_cmd //= $variables->{UBOOT_CMD} // 'bootm $kernel_addr $ramdisk_addr $fdt_addr'; + $uboot_cmd //= $variables->{UBOOT_CMD} // 'bootm $kernel_addr $ramdisk_addr $fdt_addr'; + if (!$variables->{NO_BOOT} && $uboot_cmd ne '') { $uboot_cmd =~ s/\$kernel_addr/$uboot_addr{kernel}/g; $uboot_cmd =~ s/\$ramdisk_addr/$uboot_addr{ramdisk}/g; $uboot_cmd =~ s/\$fdt_addr/$uboot_addr{fdt}/g; -- 2.39.2