Update changelog for 20150127a release

[novaboot.git] / novaboot

diff --git a/novaboot b/novaboot
index afb5e32388d7796b78efd7f1232d6bd18e95643e..7603aa6e8d9cb661a1db6c7d5591616cbb02b7d3 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -870,10 +870,12 @@ foreach my $script (@scripts) {
        map({ my $file = (split)[0]; die "$file: $!" if ! -f $file; } @$modules);
        my $istty = -t STDOUT && ($ENV{'TERM'} || 'dumb') ne 'dumb';
        my $progress = $istty ? "--progress" : "";
-       system_verbose("rsync $progress -RLp $rsync_flags $files $real_server");
-       if ($server =~ m|/\$NAME$| && $concat) {
-           my $cmd = join("; ", map { "( cd $path/.. && cat */$_ > $_ )" } @bootloader_configs);
-           system_verbose($hostname ? "ssh $hostname '$cmd'" : $cmd);
+       if ($files) {
+           system_verbose("rsync $progress -RLp $rsync_flags $files $real_server");
+           if ($server =~ m|/\$NAME$| && $concat) {
+               my $cmd = join("; ", map { "( cd $path/.. && cat */$_ > $_ )" } @bootloader_configs);
+               system_verbose($hostname ? "ssh $hostname '$cmd'" : $cmd);
+           }
        }
     }
 
@@ -1092,9 +1094,8 @@ if (defined $uboot) {
        $exp->expect($timeout, $uboot_prompt) || die "U-Boot prompt timeout";
     }
 
-    # Boot the system if there are some load lines in the script
-    if ((scalar(@$modules) > 0 && !$variables->{NO_BOOT}) ||
-       defined $uboot_cmd) {
+    # Load files if there are some load lines in the script
+    if (scalar(@$modules) > 0  && !$variables->{NO_BOOT}) {
        my ($kbin, $kcmd) = split(' ', shift(@$modules), 2);
        my $dtb;
        @$modules = map { if (/\.dtb$/) { $dtb=$_; (); } else { $_ } } @$modules;
@@ -1128,6 +1129,8 @@ if (defined $uboot) {
        $exp->send("setenv bootargs $kcmd\n");
        $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 =~ s/\$kernel_addr/$uboot_addr{kernel}/g;
        $uboot_cmd =~ s/\$ramdisk_addr/$uboot_addr{ramdisk}/g;