Fix boot problems

Now cyclictest should be bootable.

diff --git a/.novaboot b/.novaboot
deleted file mode 100644 (file)
index 0cd421a..0000000
--- a/.novaboot
+++ /dev/null
@@ -1 +0,0 @@
-$default_target = 'ryuglab';

diff --git a/boot_script b/boot_script
index f416e4e5fa1ffa520964d225b5a8819b98887431..8fe9bb1e65cd416ee547f689d2ae8e513d3c070d 100755 (executable)
--- 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 5eae7084de9546c271dcc1f8be0a698ce4adc338..392d83af76a90aa9386c7107feb9a61721a6132a 100644 (file)
--- 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 (file)
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 (executable)
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 (executable)
index 7e548ad..0000000
--- a/root/cyclictest/overlay/usr/bin/linux-conf-perf
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo Hello