From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Tue, 3 May 2016 00:11:43 +0000 (+0200)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:jailhouse-test
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/jailhouse-test.git/commitdiff_plain/e855b43b84b1f9bad9c291d20454791c2a9e6e30?hp=788e626186346cc43f2c0f4b1f5a5ec2de7bee94

Merge branch 'master' of rtime.felk.cvut.cz:jailhouse-test
---

diff --git a/buildroot-overlay/etc/inittab b/buildroot-overlay/etc/inittab
new file mode 100644
index 0000000..4e086e1
--- /dev/null
+++ b/buildroot-overlay/etc/inittab
@@ -0,0 +1,35 @@
+# /etc/inittab
+#
+# Copyright (C) 2001 Erik Andersen <andersen@codepoet.org>
+#
+# Note: BusyBox init doesn't support runlevels.  The runlevels field is
+# completely ignored by BusyBox init. If you want runlevels, use
+# sysvinit.
+#
+# Format for each entry: <id>:<runlevels>:<action>:<process>
+#
+# id        == tty to run on, or empty for /dev/console
+# runlevels == ignored
+# action    == one of sysinit, respawn, askfirst, wait, and once
+# process   == program to run
+
+# Startup the system
+null::sysinit:/bin/mount -t proc proc /proc
+null::sysinit:/bin/mount -o remount,rw /
+null::sysinit:/bin/mkdir -p /dev/pts
+null::sysinit:/bin/mkdir -p /dev/shm
+null::sysinit:/bin/mount -a
+null::sysinit:/bin/hostname -F /etc/hostname
+# now run any rc scripts
+::sysinit:/etc/init.d/rcS
+
+# Put a getty on the serial port
+#console::respawn:/sbin/getty -L  console 0 vt100 # GENERIC_SERIAL
+console::respawn:/bin/login root tty1 </dev/tty1 >/dev/tty1 2>&1
+# Stuff to do for the 3-finger salute
+::ctrlaltdel:/sbin/reboot
+
+# Stuff to do before rebooting
+::shutdown:/etc/init.d/rcK
+::shutdown:/sbin/swapoff -a
+::shutdown:/bin/umount -a -r
diff --git a/buildroot-overlay/etc/profile.d/add-jh-to-path.sh b/buildroot-overlay/etc/profile.d/S21add-jh-to-path.sh
old mode 100644
new mode 100755
similarity index 100%
rename from buildroot-overlay/etc/profile.d/add-jh-to-path.sh
rename to buildroot-overlay/etc/profile.d/S21add-jh-to-path.sh
diff --git a/buildroot-overlay/etc/profile.d/S22starttask.sh b/buildroot-overlay/etc/profile.d/S22starttask.sh
new file mode 100755
index 0000000..948d092
--- /dev/null
+++ b/buildroot-overlay/etc/profile.d/S22starttask.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e;
+/root/jailhouse-init.sh
+exec /root/fiasco-ferret-bench.sh
diff --git a/jailhouse b/jailhouse
index 287503f..7319ef5 160000
--- a/jailhouse
+++ b/jailhouse
@@ -1 +1 @@
-Subproject commit 287503fb40db8184c5f1a438543e72e8bbdef436
+Subproject commit 7319ef5061d4d6288fb982147e07286a8a827a93
diff --git a/qemu-launch-scripts/start-qemu-amd.sh b/qemu-launch-scripts/start-qemu-amd.sh
index a46a166..9a8420b 100755
--- a/qemu-launch-scripts/start-qemu-amd.sh
+++ b/qemu-launch-scripts/start-qemu-amd.sh
@@ -17,5 +17,5 @@ qemu-system-x86_64 -machine q35 -m 1G -enable-kvm -smp 4 \
 	-cpu host,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+svm,+x2apic \
 	-kernel "$KIMG" -append "root=/dev/sda memmap=66M$0x3b000000 nohpet" \
 	-drive file="$RFSIMG",format=raw,id=disk,if=none \
-        -device ide-hd,drive=disk -serial stdio	-serial vc \
+        -device ide-hd,drive=disk -serial stdio -serial vc \
         -device intel-hda,addr=1b.0 -device hda-duplex