Don't use the implicitely specified kernel

This make it easier to boot other OSes than NOVA. If you want to keep
the old behavior add

  $hypervisor = "bin/apps/hypervisor";

to your .novaboot file.

diff --git a/examples/linux-test b/examples/linux-test
index f5d9a6f17f62ff51082e3d91f60e865363150381..67927cd55361bca7830b9fb5ed9a2b77a08882b4 100755 (executable)
--- a/examples/linux-test
+++ b/examples/linux-test
@@ -7,5 +7,5 @@
 #   git submodule update --init
 #   make -C build/buildroot.
 
-KERNEL=build/buildroot/images/bzImage console=ttyS0,115200
+build/buildroot/images/bzImage console=ttyS0,115200
 build/buildroot/images/rootfs.cpio.gz

diff --git a/novaboot b/novaboot
index 8d6bc8a112196292bb1801992cd0b897412b67ad..698655772beaa8d1ba2514cb9d8d584a06f0e08d 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -37,7 +37,7 @@ chomp(my $gittop = `git rev-parse --show-toplevel 2>/dev/null`);
 ## Configuration file handling
 
 # Default configuration
-$CFG::hypervisor = "bin/apps/hypervisor";
+$CFG::hypervisor = "";
 $CFG::hypervisor_params = "serial";
 $CFG::server = "erwin.inf.tu-dresden.de:boot/novaboot/\$NAME";
 $CFG::server_grub_prefix = "(nd)/tftpboot/sojka/novaboot/\$NAME";
@@ -487,14 +487,16 @@ foreach my $script (@scripts) {
     if (exists $variables->{KERNEL}) {
        $kernel = $variables->{KERNEL};
     } else {
-       $kernel = $CFG::hypervisor . " ";
-       if (exists $variables->{HYPERVISOR_PARAMS}) {
-           $kernel .= $variables->{HYPERVISOR_PARAMS};
-       } else {
-           $kernel .= $CFG::hypervisor_params;
+       if ($CFG::hypervisor) {
+           $kernel = $CFG::hypervisor . " ";
+           if (exists $variables->{HYPERVISOR_PARAMS}) {
+               $kernel .= $variables->{HYPERVISOR_PARAMS};
+           } else {
+               $kernel .= $CFG::hypervisor_params;
+           }
        }
     }
-    @$modules = ($kernel, @$modules);
+    @$modules = ($kernel, @$modules) if $kernel;
     @$modules = (@CFG::chainloaders, @$modules);
     @$modules = ("bin/boot/bender", @$modules) if ($bender || defined $ENV{'NOVABOOT_BENDER'});