Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Install 50-qubes-mem-hotplug.rules in /lib/udev instead of /etc/udev

Browse Source
This commit is contained in:
Amadeusz Piotr Żołnowski 2019-12-17 23:03:25 +00:00
parent f76b30008f
commit bc1e02d4d4
No known key found for this signature in database
GPG Key ID: CBCC8023F59E1704
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archlinux/PKGBUILD.install
View File

@ -355,10 +355,6 @@ post_install() {
continue continue
fi fi
if [ "$(basename "$f")" == "50-qubes-mem-hotplug.rules" ] ; then
continue
fi
if echo "$f" | grep -q qubes; then if echo "$f" | grep -q qubes; then
continue continue
fi fi

2
debian/qubes-core-agent.install vendored
View File

@ -55,7 +55,6 @@ etc/sudoers.d/umask
etc/sysctl.d/20_tcp_timestamps.conf etc/sysctl.d/20_tcp_timestamps.conf
etc/sysctl.d/80-qubes.conf etc/sysctl.d/80-qubes.conf
etc/systemd/system/haveged.service etc/systemd/system/haveged.service
etc/udev/rules.d/50-qubes-mem-hotplug.rules
lib/modules-load.d/qubes-core.conf lib/modules-load.d/qubes-core.conf
lib/systemd/system-preset/75-qubes-vm.preset lib/systemd/system-preset/75-qubes-vm.preset
lib/systemd/system/boot.automount.d/30_qubes.conf 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.service.d/30_qubes.conf
lib/systemd/system/tor@default.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/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-desktop-run
usr/bin/qubes-open usr/bin/qubes-open
usr/bin/qubes-session-autostart usr/bin/qubes-session-autostart

4
misc/Makefile
View File

@ -1,7 +1,7 @@
BINDIR ?= /usr/bin BINDIR ?= /usr/bin
DATADIR ?= /usr/share DATADIR ?= /usr/share
SYSCONFDIR ?= /etc SYSLIBDIR ?= /lib
UDEVRULESDIR = $(SYSCONFDIR)/udev/rules.d UDEVRULESDIR = $(SYSLIBDIR)/udev/rules.d
QUBESDATADIR = $(DATADIR)/qubes QUBESDATADIR = $(DATADIR)/qubes
.PHONY: all clean install .PHONY: all clean install

6
rpm_spec/core-agent.spec.in
View File

@ -424,10 +424,6 @@ do
continue continue
fi fi
if [ $(basename $f) == "50-qubes-mem-hotplug.rules" ] ; then
continue
fi
if echo $f | grep -q qubes; then if echo $f | grep -q qubes; then
continue continue
fi fi
@ -610,7 +606,6 @@ rm -f %{name}-%{version}
%config(noreplace) /etc/sudoers.d/qt_x11_no_mitshm %config(noreplace) /etc/sudoers.d/qt_x11_no_mitshm
%config(noreplace) /etc/sudoers.d/umask %config(noreplace) /etc/sudoers.d/umask
%config(noreplace) /etc/sysctl.d/20_tcp_timestamps.conf %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/qubes-suspend-module-blacklist
%config(noreplace) /etc/yum.conf.d/qubes-proxy.conf %config(noreplace) /etc/yum.conf.d/qubes-proxy.conf
%config(noreplace) /etc/yum.repos.d/qubes-r4.repo %config(noreplace) /etc/yum.repos.d/qubes-r4.repo
@ -620,6 +615,7 @@ rm -f %{name}-%{version}
%endif %endif
%config(noreplace) /etc/dnf/plugins/qubes-hooks.conf %config(noreplace) /etc/dnf/plugins/qubes-hooks.conf
%config(noreplace) /etc/dconf/db/local.d/dpi %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/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf
/usr/sbin/qubes-serial-login /usr/sbin/qubes-serial-login
/usr/bin/qvm-copy-to-vm /usr/bin/qvm-copy-to-vm