QubesOS/qubes-linux-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move udev scripts to /usr/lib/qubes, move rules to /lib/udev/

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

QubesOS/qubes-issues#1416
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-26 22:18:03 +01:00
parent 031dd4c844
commit 7148f8d135
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/qubes-utils.install vendored
View File

@ -1,6 +1,6 @@
usr/sbin/meminfo-writer usr/sbin/meminfo-writer
lib/systemd/system/qubes-meminfo-writer.service lib/systemd/system/qubes-meminfo-writer.service
usr/libexec/qubes/* usr/lib/qubes/*
usr/include/* usr/include/*
usr/lib/* usr/lib/*
etc/* lib/udev/*

4
rpm_spec/qubes-utils.spec
View File

@ -72,8 +72,8 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
/etc/udev/rules.d/99-qubes-*.rules /lib/udev/rules.d/99-qubes-*.rules
/usr/libexec/qubes/udev-* /usr/lib/qubes/udev-*
%{_sbindir}/meminfo-writer %{_sbindir}/meminfo-writer
%{_unitdir}/qubes-meminfo-writer.service %{_unitdir}/qubes-meminfo-writer.service
%{_unitdir}/qubes-meminfo-writer-dom0.service %{_unitdir}/qubes-meminfo-writer-dom0.service

20
udev/Makefile
View File

@ -1,14 +1,14 @@
all: all:
install: install:
mkdir -p $(DESTDIR)/etc/udev/rules.d mkdir -p $(DESTDIR)/lib/udev/rules.d
cp udev-qubes-block.rules $(DESTDIR)/etc/udev/rules.d/99-qubes-block.rules cp udev-qubes-block.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-block.rules
cp udev-qubes-usb.rules $(DESTDIR)/etc/udev/rules.d/99-qubes-usb.rules cp udev-qubes-usb.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-usb.rules
cp udev-qubes-misc.rules $(DESTDIR)/etc/udev/rules.d/99-qubes-misc.rules cp udev-qubes-misc.rules $(DESTDIR)/lib/udev/rules.d/99-qubes-misc.rules
mkdir -p $(DESTDIR)/usr/libexec/qubes mkdir -p $(DESTDIR)/usr/lib/qubes
cp udev-block-add-change $(DESTDIR)/usr/libexec/qubes/ cp udev-block-add-change $(DESTDIR)/usr/lib/qubes/
cp udev-block-remove $(DESTDIR)/usr/libexec/qubes/ cp udev-block-remove $(DESTDIR)/usr/lib/qubes/
cp udev-block-cleanup $(DESTDIR)/usr/libexec/qubes/ cp udev-block-cleanup $(DESTDIR)/usr/lib/qubes/
cp udev-usb-add-change $(DESTDIR)/usr/libexec/qubes/ cp udev-usb-add-change $(DESTDIR)/usr/lib/qubes/
cp udev-usb-remove $(DESTDIR)/usr/libexec/qubes/ cp udev-usb-remove $(DESTDIR)/usr/lib/qubes/

8
udev/udev-qubes-block.rules
View File

@ -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" ENV{MAJOR}=="253", ENV{DM_NAME}=="", GOTO="qubes_block_end"
IMPORT{db}="QUBES_EXPOSED" IMPORT{db}="QUBES_EXPOSED"
ACTION=="add", IMPORT{program}="/usr/libexec/qubes/udev-block-add-change" ACTION=="add", IMPORT{program}="/usr/lib/qubes/udev-block-add-change"
ACTION=="change", IMPORT{program}="/usr/libexec/qubes/udev-block-add-change" ACTION=="change", IMPORT{program}="/usr/lib/qubes/udev-block-add-change"
ACTION=="remove", RUN+="/usr/libexec/qubes/udev-block-remove" ACTION=="remove", RUN+="/usr/lib/qubes/udev-block-remove"
LABEL="qubes_block_end" LABEL="qubes_block_end"
# Cleanup disconnected frontend from xenstore # 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"

6
udev/udev-qubes-usb.rules
View File

@ -3,8 +3,8 @@
# Handle only USB devices # Handle only USB devices
SUBSYSTEM!="usb", GOTO="qubes_usb_end" SUBSYSTEM!="usb", GOTO="qubes_usb_end"
ACTION=="add", IMPORT{program}="/usr/libexec/qubes/udev-usb-add-change" ACTION=="add", IMPORT{program}="/usr/lib/qubes/udev-usb-add-change"
ACTION=="change", IMPORT{program}="/usr/libexec/qubes/udev-usb-add-change" ACTION=="change", IMPORT{program}="/usr/lib/qubes/udev-usb-add-change"
ACTION=="remove", RUN+="/usr/libexec/qubes/udev-usb-remove" ACTION=="remove", RUN+="/usr/lib/qubes/udev-usb-remove"
LABEL="qubes_usb_end" LABEL="qubes_usb_end"