Commit 0b191e60 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

logind: hook uaccess into udev by default

parent b4f78aea
......@@ -218,9 +218,11 @@ dist_dbussystemservice_DATA = \
dist_udevrules_DATA = \
src/70-uaccess.rules \
src/71-seat.rules \
src/73-seat-late.rules \
src/99-systemd.rules
nodist_udevrules_DATA = \
src/73-seat-late.rules
dbusinterface_DATA = \
org.freedesktop.systemd1.Manager.xml \
org.freedesktop.systemd1.Job.xml \
......@@ -404,7 +406,8 @@ EXTRA_DIST = \
units/quotacheck.service.in \
systemd.pc.in \
introspect.awk \
src/org.freedesktop.systemd1.policy.in
src/org.freedesktop.systemd1.policy.in \
src/73-seat-late.rules.in
if ENABLE_BINFMT
EXTRA_DIST += \
......@@ -1306,6 +1309,9 @@ man/%: man/%.in Makefile
src/%.policy: src/%.policy.in Makefile
$(SED_PROCESS)
src/%.rules: src/%.rules.in Makefile
$(SED_PROCESS)
M4_PROCESS_SYSTEM = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
......
......@@ -2,3 +2,4 @@ org.freedesktop.systemd1.policy
gnome-ask-password-agent.c
systemd-interfaces.c
systemadm.c
73-seat-late.rules
......@@ -12,4 +12,6 @@ ENV{ID_SEAT}=="", IMPORT{parent}="ID_SEAT"
ENV{ID_SEAT}!="", TAG+="$env{ID_SEAT}"
TAG=="uaccess", RUN+="@rootlibexecdir@/systemd-uaccess $env{DEVNAME} $env{ID_SEAT}"
LABEL="seat_late_end"
......@@ -37,7 +37,6 @@
* spawn user systemd
* direct client API
* verify access to SetIdleHint
* hook up ACL tool for udev
*
* udev:
* drop redundant udev_device_get_is_initialized() use as soon as libudev is fixed
......
......@@ -36,14 +36,14 @@ int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
if (argc != 2) {
log_error("This program expects two argument.");
if (argc < 2 || argc > 3) {
log_error("This program expects one or two arguments.");
r = -EINVAL;
goto finish;
}
path = argv[1];
seat = argv[2];
seat = argc >= 3 ? argv[2] : "seat0";
p = strappend("/run/systemd/seats/", seat);
if (!p) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment