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
This commit is contained in:
parent
031dd4c844
commit
7148f8d135
4
debian/qubes-utils.install
vendored
4
debian/qubes-utils.install
vendored
@ -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/*
|
||||
|
@ -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
|
||||
|
@ -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/
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user