diff options
| author | Robby Workman <rworkman@slackware.com> | 2014-12-08 00:55:13 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2014-12-08 13:47:09 -0600 |
| commit | aa548ebc044767ced3c1a22f8b8086c910a27831 (patch) | |
| tree | e96624c23221951345a140fe04d3c7bef642aa82 /tools | |
| parent | 40137c006c341542fec8be139b3acea78afb584e (diff) | |
| download | ConsoleKit2-aa548ebc044767ced3c1a22f8b8086c910a27831.tar.gz | |
Add --with-rundir configure flag
This allows use of /run on tmpfs instead of /var/run
without downstream symlink magic or patches.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/70-udev-acl.rules.in (renamed from tools/70-udev-acl.rules) | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 1 | ||||
| -rw-r--r-- | tools/udev-acl.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tools/70-udev-acl.rules b/tools/70-udev-acl.rules.in index 2dac283..de6720e 100644 --- a/tools/70-udev-acl.rules +++ b/tools/70-udev-acl.rules.in @@ -70,7 +70,7 @@ ENV{DDC_DEVICE}=="*?", TAG+="udev-acl" SUBSYSTEM=="usb", ENV{ID_MEDIA_PLAYER}=="?*", TAG+="udev-acl" # apply ACL for all locally logged in users -LABEL="acl_apply", TAG=="udev-acl", TEST=="/var/run/ConsoleKit/database", \ +LABEL="acl_apply", TAG=="udev-acl", TEST=="@RUNDIR@/ConsoleKit/database", \ RUN+="udev-acl --action=$env{ACTION} --device=$env{DEVNAME}" LABEL="acl_end" diff --git a/tools/Makefile.am b/tools/Makefile.am index 774b4ed..5138e03 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -45,6 +45,7 @@ AM_CFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DLOCALSTATEDIR=\""$(localstatedir)"\" \ + -DRUNDIR=\""$(RUNDIR)"\" \ -DLOCALEDIR=\"$(localedir)\" \ $(HISTORY_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/tools/udev-acl.c b/tools/udev-acl.c index 4f49f04..5e394fb 100644 --- a/tools/udev-acl.c +++ b/tools/udev-acl.c @@ -132,7 +132,7 @@ static GSList *uids_with_local_active_session(const char *own_id) GKeyFile *keyfile; keyfile = g_key_file_new(); - if (g_key_file_load_from_file(keyfile, "/var/run/ConsoleKit/database", 0, NULL)) { + if (g_key_file_load_from_file(keyfile, RUNDIR "/ConsoleKit/database", 0, NULL)) { gchar **groups; groups = g_key_file_get_groups(keyfile, NULL); |