From 655f43cdac8c56cadc2b14f65cc7041d5eba5ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <kocikare@fel.cvut.cz>
Date: Thu, 6 Aug 2015 16:28:05 +0200
Subject: Fix boot problems

Now cyclictest should be bootable.
---
 .novaboot                                       | 1 -
 boot_script                                     | 7 +++----
 cyclictest.nb                                   | 2 +-
 root/cyclictest/overlay/etc/inittab             | 3 ---
 root/cyclictest/overlay/sbin/lcpinit            | 5 +++++
 root/cyclictest/overlay/usr/bin/linux-conf-perf | 3 ---
 6 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 .novaboot
 delete mode 100644 root/cyclictest/overlay/etc/inittab
 create mode 100755 root/cyclictest/overlay/sbin/lcpinit
 delete mode 100755 root/cyclictest/overlay/usr/bin/linux-conf-perf

diff --git a/.novaboot b/.novaboot
deleted file mode 100644
index 0cd421a..0000000
--- a/.novaboot
+++ /dev/null
@@ -1 +0,0 @@
-$default_target = 'ryuglab';
diff --git a/boot_script b/boot_script
index f416e4e..8fe9bb1 100755
--- a/boot_script
+++ b/boot_script
@@ -1,7 +1,6 @@
 #!/bin/bash
-
-# Wake target
-sudo /usr/sbin/etherwake 00:0c:f1:77:ec:46
+# Wake target if target is suspended
+# sudo /usr/sbin/etherwake 00:0c:f1:77:ec:46
 
 # Boot using novaboot
-novaboot cyclictest.nb
+novaboot cyclictest.nb --exiton="NOVABOOT EXIT LINUX-CONF-PERF" --target="ryuglab"
diff --git a/cyclictest.nb b/cyclictest.nb
index 5eae708..392d83a 100644
--- a/cyclictest.nb
+++ b/cyclictest.nb
@@ -1,5 +1,5 @@
 #!/usr/bin/env novaboot
 # -*-sh-*-
-load jobfiles/linuxImage console=ttyPSC0,115200 quiet
+load jobfiles/linuxImage console=ttyPSC0,115200 quiet init=/sbin/lcpinit
 load shark-ryu.dtb
 load root/cyclictest/images/rootfs.cpio.uboot
diff --git a/root/cyclictest/overlay/etc/inittab b/root/cyclictest/overlay/etc/inittab
deleted file mode 100644
index 3290343..0000000
--- a/root/cyclictest/overlay/etc/inittab
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# linux-conf-perf init script
-console::sysinit:/usr/bin/linux-conf-perf -L console 115200 vt100
diff --git a/root/cyclictest/overlay/sbin/lcpinit b/root/cyclictest/overlay/sbin/lcpinit
new file mode 100755
index 0000000..e28aef2
--- /dev/null
+++ b/root/cyclictest/overlay/sbin/lcpinit
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo Hello
+
+echo "NOVABOOT EXIT LINUX-CONF-PERF"
diff --git a/root/cyclictest/overlay/usr/bin/linux-conf-perf b/root/cyclictest/overlay/usr/bin/linux-conf-perf
deleted file mode 100755
index 7e548ad..0000000
--- a/root/cyclictest/overlay/usr/bin/linux-conf-perf
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo Hello
-- 
cgit v1.2.3