From 7148f8d135e8841e5bd58f2a4240d84875393098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Thu, 26 Nov 2015 22:18:03 +0100
Subject: [PATCH] Move udev scripts to /usr/lib/qubes, move rules to /lib/udev/

Resolve udev-rule-in-etc, non-standard-dir-in-usr, file-in-unusual-dir
lintian warnings.

QubesOS/qubes-issues#1416
---
 debian/qubes-utils.install  |  4 ++--
 rpm_spec/qubes-utils.spec   |  4 ++--
 udev/Makefile               | 20 ++++++++++----------
 udev/udev-qubes-block.rules |  8 ++++----
 udev/udev-qubes-usb.rules   |  6 +++---
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/qubes-utils.install b/debian/qubes-utils.install
index 1a8771d..fb425da 100644
--- a/debian/qubes-utils.install
+++ b/debian/qubes-utils.install
@@ -1,6 +1,6 @@
 usr/sbin/meminfo-writer
 lib/systemd/system/qubes-meminfo-writer.service
-usr/libexec/qubes/*
+usr/lib/qubes/*
 usr/include/*
 usr/lib/*
-etc/*
+lib/udev/*
diff --git a/rpm_spec/qubes-utils.spec b/rpm_spec/qubes-utils.spec
index e4fe8cc..7335127 100644
--- a/rpm_spec/qubes-utils.spec
+++ b/rpm_spec/qubes-utils.spec
@@ -72,8 +72,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-/etc/udev/rules.d/99-qubes-*.rules
-/usr/libexec/qubes/udev-*
+/lib/udev/rules.d/99-qubes-*.rules
+/usr/lib/qubes/udev-*
 %{_sbindir}/meminfo-writer
 %{_unitdir}/qubes-meminfo-writer.service
 %{_unitdir}/qubes-meminfo-writer-dom0.service
diff --git a/udev/Makefile b/udev/Makefile
index a5c029f..0781c27 100644
--- a/udev/Makefile
+++ b/udev/Makefile
@@ -1,14 +1,14 @@
 all:
 
 install:
-	mkdir -p $(DESTDIR)/etc/udev/rules.d
-	cp udev-qubes-block.rules $(DESTDIR)/etc/udev/rules.d/99-qubes-block.rules
-	cp udev-qubes-usb.rules $(DESTDIR)/etc/udev/rules.d/99-qubes-usb.rules
-	cp udev-qubes-misc.rules $(DESTDIR)/etc/udev/rules.d/99-qubes-misc.rules
+	mkdir -p $(DESTDIR)/lib/udev/rules.d
+	cp udev-qubes-block.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-block.rules
+	cp udev-qubes-usb.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-usb.rules
+	cp udev-qubes-misc.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-misc.rules
 
-	mkdir -p $(DESTDIR)/usr/libexec/qubes
-	cp udev-block-add-change $(DESTDIR)/usr/libexec/qubes/
-	cp udev-block-remove $(DESTDIR)/usr/libexec/qubes/
-	cp udev-block-cleanup $(DESTDIR)/usr/libexec/qubes/
-	cp udev-usb-add-change $(DESTDIR)/usr/libexec/qubes/
-	cp udev-usb-remove $(DESTDIR)/usr/libexec/qubes/
+	mkdir -p $(DESTDIR)/usr/lib/qubes
+	cp udev-block-add-change $(DESTDIR)/usr/lib/qubes/
+	cp udev-block-remove $(DESTDIR)/usr/lib/qubes/
+	cp udev-block-cleanup $(DESTDIR)/usr/lib/qubes/
+	cp udev-usb-add-change $(DESTDIR)/usr/lib/qubes/
+	cp udev-usb-remove $(DESTDIR)/usr/lib/qubes/
diff --git a/udev/udev-qubes-block.rules b/udev/udev-qubes-block.rules
index 79c416e..5b02335 100644
--- a/udev/udev-qubes-block.rules
+++ b/udev/udev-qubes-block.rules
@@ -16,11 +16,11 @@ ENV{MAJOR}=="253", ENV{DM_NAME}=="origin-*", GOTO="qubes_block_end"
 ENV{MAJOR}=="253", ENV{DM_NAME}=="", GOTO="qubes_block_end"
 
 IMPORT{db}="QUBES_EXPOSED"
-ACTION=="add", IMPORT{program}="/usr/libexec/qubes/udev-block-add-change"
-ACTION=="change", IMPORT{program}="/usr/libexec/qubes/udev-block-add-change"
-ACTION=="remove", RUN+="/usr/libexec/qubes/udev-block-remove"
+ACTION=="add", IMPORT{program}="/usr/lib/qubes/udev-block-add-change"
+ACTION=="change", IMPORT{program}="/usr/lib/qubes/udev-block-add-change"
+ACTION=="remove", RUN+="/usr/lib/qubes/udev-block-remove"
 
 LABEL="qubes_block_end"
 
 # Cleanup disconnected frontend from xenstore
-ACTION=="remove", SUBSYSTEM=="block", ENV{MAJOR}=="202", RUN+="/usr/libexec/qubes/udev-block-cleanup"
+ACTION=="remove", SUBSYSTEM=="block", ENV{MAJOR}=="202", RUN+="/usr/lib/qubes/udev-block-cleanup"
diff --git a/udev/udev-qubes-usb.rules b/udev/udev-qubes-usb.rules
index 5b85bfd..af39702 100644
--- a/udev/udev-qubes-usb.rules
+++ b/udev/udev-qubes-usb.rules
@@ -3,8 +3,8 @@
 # Handle only USB devices
 SUBSYSTEM!="usb", GOTO="qubes_usb_end"
 
-ACTION=="add", IMPORT{program}="/usr/libexec/qubes/udev-usb-add-change"
-ACTION=="change", IMPORT{program}="/usr/libexec/qubes/udev-usb-add-change"
-ACTION=="remove", RUN+="/usr/libexec/qubes/udev-usb-remove"
+ACTION=="add", IMPORT{program}="/usr/lib/qubes/udev-usb-add-change"
+ACTION=="change", IMPORT{program}="/usr/lib/qubes/udev-usb-add-change"
+ACTION=="remove", RUN+="/usr/lib/qubes/udev-usb-remove"
 
 LABEL="qubes_usb_end"