From: Michal Sojka <michal.sojka@cvut.cz>
Date: Sun, 26 Aug 2018 21:27:46 +0000 (+0200)
Subject: deb: Do not start jailhouse automatically
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/hercules2020/jailhouse-build.git/commitdiff_plain/6bc49ff7de4f1064f41994955b03aabc97480602

deb: Do not start jailhouse automatically

When jailhouse is started automatically (relatively early) during the
boot, something in the user space reads from 0xf0000 (see below),
which is not allowed by Jailhouse memory map. So far it is not clear
what it is and what it tries to read. According to TX2 memory map,
nothing should be there.

    Unhandled data read at 0xf0000(1)

    FATAL: unhandled trap (exception class 0x24)
    Cell state before exception:
     pc: 0000007f9a22fb40   lr: 000000557e594360 spsr: 20000000     EL0
---

diff --git a/README b/README
index e8eac01..efb8eaf 100644
--- a/README
+++ b/README
@@ -42,8 +42,8 @@ Copy the resulting .deb package to the board and install it with
 
     dpkg -i jailhouse_*.deb
 
-Then, after rebooting choose "prem kernel and jailhouse" entry from
-the extlinux boot menu. Jailhouse will start automatically during the
-boot. You can use `systemctl` command to see its status, stop it etc.:
+After rebooting, choose "prem kernel and jailhouse" entry from the
+extlinux boot menu. Once the stsren boots, use `systemctl` command to
+start/stop jailhouse:
 
-	systemctl {status|start|stop} jailhouse
+	systemctl {start|stop|status} jailhouse
diff --git a/build/Makefile b/build/Makefile
index b609ecc..169d90f 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -87,8 +87,8 @@ deb: jailhouse-install linux_install modules_install DEBIAN_DIR
 	rm -f _install.deb/lib/modules/*/source _install.deb/lib/modules/*/build
 	install -D ./rootfs-overlay/etc/init.d/S20jailhouse.sh $(DESTDIR)/etc/init.d/jailhouse
 	install -m644 -D ./rootfs-overlay/etc/systemd/system/jailhouse.service $(DESTDIR)/lib/systemd/system/jailhouse.service
-	install -d $(DESTDIR)/lib/systemd/system/multi-user.target.wants/
-	ln -sf ../jailhouse.service $(DESTDIR)/lib/systemd/system/multi-user.target.wants/jailhouse.service
+	#install -d $(DESTDIR)/lib/systemd/system/multi-user.target.wants/
+	#ln -sf ../jailhouse.service $(DESTDIR)/lib/systemd/system/multi-user.target.wants/jailhouse.service
 # Note: --root-owner-group requires dpkg version 1.19.0+
 	dpkg-deb --root-owner-group --build $(DESTDIR) .