File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ BINDIR ?= /usr/bin
22DATADIR ?= /usr/share
33SYSLIBDIR ?= /lib
44LIBDIR ?= /usr/lib
5+ ETCSECURITYDIR ?= /etc/security
56QUBESLIBDIR := $(LIBDIR ) /qubes
67UDEVRULESDIR := $(SYSLIBDIR ) /udev/rules.d
78QUBESDATADIR := $(DATADIR ) /qubes
@@ -52,7 +53,7 @@ install:
5253 install -m 0755 -d $(DESTDIR ) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml
5354 install -m 0644 -t $(DESTDIR ) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml xfce4-notifyd.xml
5455 install -m 0644 -t $(DESTDIR ) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml displays.xml
55- install -m 0644 -D -t $(DESTDIR ) /etc/security /limits.d 90-qubes-core.conf
56+ install -m 0644 -D -t $(DESTDIR )$( ETCSECURITYDIR ) /limits.d 90-qubes-core.conf
5657 install -m 0644 -D -t $(DESTDIR ) /usr/lib/sysctl.d 20-qubes-core.conf
5758
5859marker-vm : marker-vm.in
Original file line number Diff line number Diff line change @@ -490,6 +490,10 @@ usermod -L root
490490
491491%install
492492
493+ %if 0%{?is_opensuse}
494+ export ETCSECURITYDIR=/usr/etc/security
495+ %endif
496+
493497make install-vm PYTHON=%{__python3} "DESTDIR=$RPM_BUILD_ROOT" SYSTEM_DROPIN_DIR=%{_unitdir} SYSLIBDIR=/usr/lib ENABLE_SELINUX=%with_selinux
494498make -C app-menu DESTDIR=$RPM_BUILD_ROOT install
495499make -C boot DESTDIR=$RPM_BUILD_ROOT install
@@ -985,7 +989,11 @@ rm -f %{name}-%{version}
985989%config(noreplace) /etc/dconf/db/local.d/dpi
986990%config(noreplace) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
987991%config(noreplace) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/displays.xml
992+ %if 0%{?is_opensuse}
993+ %config(noreplace) /usr/etc/security/limits.d/90-qubes-core.conf
994+ %else
988995%config(noreplace) /etc/security/limits.d/90-qubes-core.conf
996+ %endif
989997/usr/lib/sysctl.d/20-qubes-core.conf
990998%_udevrulesdir/50-qubes-mem-hotplug.rules
991999%_unitdir/
[email protected] /90-session-stop-timeout.conf
You can’t perform that action at this time.
0 commit comments