From d4fa357faadd4141c217013d3d64d158d5750230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 18 Jan 2019 23:20:39 +0100 Subject: [PATCH] Introduce /usr/share/qubes/marker-vm Make it easy for packages to detect Qubes VM. Fixes QubesOS/qubes-issues#1963 --- Makefile | 2 ++ debian/qubes-core-agent.install | 1 + misc/marker-vm | 1 + rpm_spec/core-agent.spec.in | 1 + 4 files changed, 5 insertions(+) create mode 100644 misc/marker-vm diff --git a/Makefile b/Makefile index 7574520..25a8ab9 100644 --- a/Makefile +++ b/Makefile @@ -312,6 +312,8 @@ install-common: install-doc install -d $(DESTDIR)/usr/lib/qubes-bind-dirs.d install -D -m 0644 misc/30_cron.conf $(DESTDIR)/usr/lib/qubes-bind-dirs.d/30_cron.conf + install -D -m 0644 misc/marker-vm $(DESTDIR)/usr/share/qubes/marker-vm + install -d $(DESTDIR)/var/run/qubes install -d $(DESTDIR)/rw diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index 226c051..27f697c 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -145,3 +145,4 @@ usr/share/applications/*.desktop usr/share/man/man1/qvm-* usr/share/qubes/mime-override/globs usr/share/qubes/qubes-master-key.asc +usr/share/qubes/marker-vm diff --git a/misc/marker-vm b/misc/marker-vm new file mode 100644 index 0000000..253db45 --- /dev/null +++ b/misc/marker-vm @@ -0,0 +1 @@ +# This is just a marker file for Qubes OS VM. diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index cb8ef24..9cc624f 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -668,6 +668,7 @@ rm -f %{name}-%{version} /usr/lib/qubes-bind-dirs.d/30_cron.conf /usr/share/applications/qubes-run-terminal.desktop /usr/share/qubes/serial.conf +/usr/share/qubes/marker-vm /usr/share/glib-2.0/schemas/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override /usr/share/glib-2.0/schemas/20_org.gnome.nautilus.qubes.gschema.override /usr/share/glib-2.0/schemas/20_org.mate.NotificationDaemon.qubes.gschema.override