From 797b939fbb8b75bfd16409f6541106d07c31fee5 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 15 Oct 2013 14:01:26 +0200
Subject: [PATCH] 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.
---
 examples/linux-test |  2 +-
 novaboot            | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/examples/linux-test b/examples/linux-test
index f5d9a6f..67927cd 100755
--- 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 8d6bc8a..6986557 100755
--- 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'});
 
-- 
2.39.2