Browse Source

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
Marek Marczykowski-Górecki 8 năm trước cách đây
mục cha
commit
074309e6a3
3 tập tin đã thay đổi với 7 bổ sung0 xóa
  1. 2 0
      Makefile
  2. 4 0
      misc/dracut-qubes.conf
  3. 1 0
      rpm_spec/core-vm.spec

+ 2 - 0
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

+ 4 - 0
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"

+ 1 - 0
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