Skip to content

Commit

Permalink
Merge pull request #3308 from stmcginnis/systemd-inhibit
Browse files Browse the repository at this point in the history
Include systemd-logind for inhibit functionality
  • Loading branch information
stmcginnis authored Aug 7, 2023
2 parents 9f53a9a + 0db6c67 commit f5d0148
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 2 additions & 0 deletions packages/systemd/systemd-tmpfiles.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ d /run/lock 0755 root root -
L /var/lock - - - - /run/lock
Z /var/lib/systemd 0755 root root -
z /var/lib/systemd/random-seed 600 root root -
R /var/lib/systemd/linger
D /var/lib/systemd/linger 0700 root root -
d /etc/sysctl.d 0700 root root -
12 changes: 11 additions & 1 deletion packages/systemd/systemd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ CONFIGURE_OPTS=(
-Dcoredump=false
-Dpstore=true
-Doomd=false
-Dlogind=false
-Dlogind=true
-Dhostnamed=false
-Dlocaled=false
-Dmachined=false
Expand Down Expand Up @@ -301,6 +301,7 @@ install -p -m 0644 %{S:4} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/i
%{_cross_bindir}/systemd-detect-virt
%{_cross_bindir}/systemd-escape
%{_cross_bindir}/systemd-id128
%{_cross_bindir}/systemd-inhibit
%{_cross_bindir}/systemd-machine-id-setup
%{_cross_bindir}/systemd-mount
%{_cross_bindir}/systemd-notify
Expand All @@ -315,6 +316,7 @@ install -p -m 0644 %{S:4} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/i
%{_cross_bindir}/systemd-tty-ask-password-agent
%{_cross_bindir}/systemd-umount
%{_cross_bindir}/udevadm
%{_cross_bindir}/loginctl

%{_cross_sbindir}/halt
%{_cross_sbindir}/init
Expand All @@ -338,11 +340,17 @@ install -p -m 0644 %{S:4} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/i
%{_cross_libdir}/udev/*
%exclude %{_cross_libdir}/tmpfiles.d/systemd-network.conf
%exclude %{_cross_libdir}/sysusers.d/systemd-network.conf
%exclude %{_cross_libdir}/systemd/system/dbus-org.freedesktop.login1.service
%exclude %{_cross_libdir}/systemd/systemd-networkd
%exclude %{_cross_libdir}/systemd/systemd-networkd-wait-online
%exclude %{_cross_libdir}/systemd/systemd-user-runtime-dir
%exclude %{_cross_libdir}/systemd/system/systemd-networkd.service
%exclude %{_cross_libdir}/systemd/system/systemd-networkd-wait-online.service
%exclude %{_cross_libdir}/systemd/system/systemd-networkd.socket
%exclude %{_cross_libdir}/pam.d/systemd-user
%exclude %{_cross_libdir}/udev/rules.d/70-uaccess.rules
%exclude %{_cross_libdir}/udev/rules.d/71-seat.rules
%exclude %{_cross_libdir}/udev/rules.d/73-seat-late.rules

%{_cross_tmpfilesdir}/*
%exclude %{_cross_tmpfilesdir}/x11.conf
Expand All @@ -355,6 +363,7 @@ install -p -m 0644 %{S:4} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/i
%{_cross_datadir}/dbus-1/*
%exclude %{_cross_datadir}/polkit-1
%exclude %{_cross_datadir}/dbus-1/system-services/org.freedesktop.network1.service
%exclude %{_cross_datadir}/dbus-1/system-services/org.freedesktop.login1.service
%exclude %{_cross_datadir}/dbus-1/system.d/org.freedesktop.network1.conf

%dir %{_cross_factorydir}
Expand All @@ -364,6 +373,7 @@ install -p -m 0644 %{S:4} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/i
%exclude %{_cross_factorydir}%{_cross_sysconfdir}/pam.d
%exclude %{_cross_factorydir}%{_cross_sysconfdir}/pam.d/other
%exclude %{_cross_factorydir}%{_cross_sysconfdir}/pam.d/system-auth
%exclude %{_cross_factorydir}%{_cross_sysconfdir}/pam.d/systemd-user

%exclude %{_cross_docdir}

Expand Down

0 comments on commit f5d0148

Please sign in to comment.