diff options
| -rw-r--r-- | src/login/73-seat-late.rules.in (renamed from src/login/73-seat-late.rules.m4) | 6 | ||||
| -rw-r--r-- | src/login/meson.build | 25 |
2 files changed, 18 insertions, 13 deletions
diff --git a/src/login/73-seat-late.rules.m4 b/src/login/73-seat-late.rules.in index c3487d25f..ed53f324d 100644 --- a/src/login/73-seat-late.rules.m4 +++ b/src/login/73-seat-late.rules.in @@ -13,14 +13,8 @@ ENV{ID_SEAT}=="", ENV{ID_AUTOSEAT}=="1", ENV{ID_FOR_SEAT}!="", ENV{ID_SEAT}="sea ENV{ID_SEAT}=="", IMPORT{parent}="ID_SEAT" ENV{ID_SEAT}!="", TAG+="$env{ID_SEAT}" -#if 0 /// elogind uses its own uaccess replacement command -# m4_ifdef(`HAVE_ACL',`` -# TAG=="uaccess", ENV{MAJOR}!="", RUN{builtin}+="uaccess"'' -# )m4_dnl -#else m4_ifdef(`HAVE_ACL',`` TAG=="uaccess", ENV{MAJOR}!="", RUN{program}+="@rootlibexecdir@/elogind-uaccess-command %N $env{ID_SEAT}"'' )m4_dnl -#endif // 0 LABEL="seat_late_end" diff --git a/src/login/meson.build b/src/login/meson.build index 1bbb7d178..2ead57665 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -108,15 +108,15 @@ loginctl_sources += files(''' install_data('org.freedesktop.login1.conf', install_dir : dbuspolicydir) -#if 0 /// Works a bit differently here, as elogind alows dbus activation. +#if 0 /// Works a bit differently here, as elogind allows dbus activation. # install_data('org.freedesktop.login1.service', # install_dir : dbussystemservicedir) #else -logind_service = configure_file( - input : 'org.freedesktop.login1.service.in', - output : 'org.freedesktop.login1.service', - configuration : substs) -install_data(logind_service, + logind_service = configure_file( + input : 'org.freedesktop.login1.service.in', + output : 'org.freedesktop.login1.service', + configuration : substs) + install_data(logind_service, install_dir : dbussystemservicedir) #endif // 0 install_data('org.freedesktop.login1.policy', @@ -135,9 +135,20 @@ install_data(logind_service, install_data(seat_rules, install_dir : udevrulesdir) +#if 1 /// elogind needs two passes of this file + seat_late_rules = configure_file( + input : '73-seat-late.rules.in', + output : '73-seat-late.rules.m4', + configuration : substs) +#endif // 1 + custom_target( '73-seat-late.rules', - input : '73-seat-late.rules.m4', +#if 0 /// elogind must configure the source +# input : '73-seat-late.rules.m4', +#else + input : seat_late_rules, +#endif // 0 output: '73-seat-late.rules', command : [meson_apply_m4, config_h, '@INPUT@'], capture : true, |