picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

logind: hook uaccess into udev by default

Browse source
This commit is contained in:
Lennart Poettering 2011-06-29 04:14:43 +02:00
parent b4f78aeac6
commit 0b191e603c
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -218,9 +218,11 @@ dist_dbussystemservice_DATA = \
dist_udevrules_DATA = \ dist_udevrules_DATA = \
src/70-uaccess.rules \ src/70-uaccess.rules \
src/71-seat.rules \ src/71-seat.rules \
src/73-seat-late.rules \
src/99-systemd.rules src/99-systemd.rules
nodist_udevrules_DATA = \
src/73-seat-late.rules
dbusinterface_DATA = \ dbusinterface_DATA = \
org.freedesktop.systemd1.Manager.xml \ org.freedesktop.systemd1.Manager.xml \
org.freedesktop.systemd1.Job.xml \ org.freedesktop.systemd1.Job.xml \
@ -404,7 +406,8 @@ EXTRA_DIST = \
units/quotacheck.service.in \ units/quotacheck.service.in \
systemd.pc.in \ systemd.pc.in \
introspect.awk \ introspect.awk \
src/org.freedesktop.systemd1.policy.in src/org.freedesktop.systemd1.policy.in \
src/73-seat-late.rules.in
if ENABLE_BINFMT if ENABLE_BINFMT
EXTRA_DIST += \ EXTRA_DIST += \
@ -1306,6 +1309,9 @@ man/%: man/%.in Makefile
src/%.policy: src/%.policy.in Makefile src/%.policy: src/%.policy.in Makefile
$(SED_PROCESS) $(SED_PROCESS)
src/%.rules: src/%.rules.in Makefile
$(SED_PROCESS)
M4_PROCESS_SYSTEM = \ M4_PROCESS_SYSTEM = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@ $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@

1
src/.gitignore vendored
View file

@ -2,3 +2,4 @@ org.freedesktop.systemd1.policy
gnome-ask-password-agent.c gnome-ask-password-agent.c
systemd-interfaces.c systemd-interfaces.c
systemadm.c systemadm.c
73-seat-late.rules

2
src/73-seat-late.rules → src/73-seat-late.rules.in
View file

@ -12,4 +12,6 @@ ENV{ID_SEAT}=="", IMPORT{parent}="ID_SEAT"
ENV{ID_SEAT}!="", TAG+="$env{ID_SEAT}" ENV{ID_SEAT}!="", TAG+="$env{ID_SEAT}"
TAG=="uaccess", RUN+="@rootlibexecdir@/systemd-uaccess $env{DEVNAME} $env{ID_SEAT}"
LABEL="seat_late_end" LABEL="seat_late_end"

1
src/logind.h
View file

@ -37,7 +37,6 @@
* spawn user systemd * spawn user systemd
* direct client API * direct client API
* verify access to SetIdleHint * verify access to SetIdleHint
* hook up ACL tool for udev
* *
* udev: * udev:
* drop redundant udev_device_get_is_initialized() use as soon as libudev is fixed * drop redundant udev_device_get_is_initialized() use as soon as libudev is fixed

6
src/uaccess.c
View file

@ -36,14 +36,14 @@ int main(int argc, char *argv[]) {
log_parse_environment(); log_parse_environment();
log_open(); log_open();
if (argc != 2) { if (argc < 2 || argc > 3) {
log_error("This program expects two argument."); log_error("This program expects one or two arguments.");
r = -EINVAL; r = -EINVAL;
goto finish; goto finish;
} }
path = argv[1]; path = argv[1];
seat = argv[2]; seat = argc >= 3 ? argv[2] : "seat0";
p = strappend("/run/systemd/seats/", seat); p = strappend("/run/systemd/seats/", seat);
if (!p) { if (!p) {