From 074309e6a31d0870e1f8f48d2f3fa9ac8d079fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 10 Nov 2015 16:35:29 +0100
Subject: [PATCH] dracut: disable hostonly mode

Initramfs created in TemplateVM may be used also in AppVMs based on it, so
technically it is different system. Especially it has different devices
mounted (own /rw, own swap etc), so prevent hardcoding UUIDs here.

QubesOS/qubes-issues#1354
---
 Makefile               | 2 ++
 misc/dracut-qubes.conf | 4 ++++
 rpm_spec/core-vm.spec  | 1 +
 3 files changed, 7 insertions(+)
 create mode 100644 misc/dracut-qubes.conf

diff --git a/Makefile b/Makefile
index 171d12f..1bd148d 100644
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,8 @@ install-rh: install-systemd install-systemd-dropins install-sysvinit
 
 	install -D -m 0644 misc/serial.conf $(DESTDIR)/usr/share/qubes/serial.conf
 	install -D misc/qubes-serial-login $(DESTDIR)/$(SBINDIR)/qubes-serial-login
+	install -D -m 0644 misc/dracut-qubes.conf \
+		$(DESTDIR)/usr/lib/dracut/dracut.conf.d/30-qubes.conf
 
 install-common:
 	$(MAKE) -C autostart-dropins install
diff --git a/misc/dracut-qubes.conf b/misc/dracut-qubes.conf
new file mode 100644
index 0000000..f8542eb
--- /dev/null
+++ b/misc/dracut-qubes.conf
@@ -0,0 +1,4 @@
+# Initramfs created in TemplateVM may be used also in AppVMs based on it, so
+# technically it is different system. Especially it has different devices
+# mounted (own /rw, own swap etc), so prevent hardcoding UUIDs here.
+hostonly="no"
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 921b1a7..f0a0c07 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -377,6 +377,7 @@ rm -f %{name}-%{version}
 /usr/lib/qubes/xdg-icon
 /usr/lib/qubes/update-proxy-configs
 /usr/lib/yum-plugins/yum-qubes-hooks.py*
+/usr/lib/dracut/dracut.conf.d/30-qubes.conf
 /usr/lib64/python2.7/site-packages/qubes/xdg.py*
 /usr/sbin/qubes-firewall
 /usr/sbin/qubes-netwatcher