From bc1e02d4d4bb05e0225e671c96c45a3a10e515ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
 <aidecoe@aidecoe.name>
Date: Tue, 17 Dec 2019 23:03:25 +0000
Subject: [PATCH] Install 50-qubes-mem-hotplug.rules in /lib/udev instead of
 /etc/udev

---
 archlinux/PKGBUILD.install      | 4 ----
 debian/qubes-core-agent.install | 2 +-
 misc/Makefile                   | 4 ++--
 rpm_spec/core-agent.spec.in     | 6 +-----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install
index d4f3030..c3e9cdf 100644
--- a/archlinux/PKGBUILD.install
+++ b/archlinux/PKGBUILD.install
@@ -355,10 +355,6 @@ post_install() {
             continue
         fi
 
-        if [ "$(basename "$f")" == "50-qubes-mem-hotplug.rules" ] ; then
-            continue
-        fi
-
         if echo "$f" | grep -q qubes; then
             continue
         fi
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 36984a9..70249da 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -55,7 +55,6 @@ etc/sudoers.d/umask
 etc/sysctl.d/20_tcp_timestamps.conf
 etc/sysctl.d/80-qubes.conf
 etc/systemd/system/haveged.service
-etc/udev/rules.d/50-qubes-mem-hotplug.rules
 lib/modules-load.d/qubes-core.conf
 lib/systemd/system-preset/75-qubes-vm.preset
 lib/systemd/system/boot.automount.d/30_qubes.conf
@@ -94,6 +93,7 @@ lib/systemd/system/tmp.mount.d/30_qubes.conf
 lib/systemd/system/tor.service.d/30_qubes.conf
 lib/systemd/system/tor@default.service.d/30_qubes.conf
 lib/systemd/system/systemd-timesyncd.service.d/30_qubes.conf
+lib/udev/rules.d/50-qubes-mem-hotplug.rules
 usr/bin/qubes-desktop-run
 usr/bin/qubes-open
 usr/bin/qubes-session-autostart
diff --git a/misc/Makefile b/misc/Makefile
index 8465d7c..e4e223f 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,7 +1,7 @@
 BINDIR ?= /usr/bin
 DATADIR ?= /usr/share
-SYSCONFDIR ?= /etc
-UDEVRULESDIR = $(SYSCONFDIR)/udev/rules.d
+SYSLIBDIR ?= /lib
+UDEVRULESDIR = $(SYSLIBDIR)/udev/rules.d
 QUBESDATADIR = $(DATADIR)/qubes
 
 .PHONY: all clean install
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 9a9d8cd..8004a96 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -424,10 +424,6 @@ do
         continue
     fi
 
-    if [ $(basename $f) == "50-qubes-mem-hotplug.rules" ] ; then
-        continue
-    fi
-
     if echo $f | grep -q qubes; then
         continue
     fi
@@ -610,7 +606,6 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/sudoers.d/qt_x11_no_mitshm
 %config(noreplace) /etc/sudoers.d/umask
 %config(noreplace) /etc/sysctl.d/20_tcp_timestamps.conf
-%config(noreplace) /etc/udev/rules.d/50-qubes-mem-hotplug.rules
 %config(noreplace) /etc/qubes-suspend-module-blacklist
 %config(noreplace) /etc/yum.conf.d/qubes-proxy.conf
 %config(noreplace) /etc/yum.repos.d/qubes-r4.repo
@@ -620,6 +615,7 @@ rm -f %{name}-%{version}
 %endif
 %config(noreplace) /etc/dnf/plugins/qubes-hooks.conf
 %config(noreplace) /etc/dconf/db/local.d/dpi
+/lib/udev/rules.d/50-qubes-mem-hotplug.rules
 /usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf
 /usr/sbin/qubes-serial-login
 /usr/bin/qvm-copy-to-vm