logind: change user-runtime-dir to query runtime dir size from logind via the bus
I think this is a slightly cleaner approach than parsing the configuration file at multiple places, as this way there's only a single reload cycle for logind.conf, and that's systemd-logind.service's runtime. This means that logind and dbus become a requirement of user-runtime-dir, but given that XDG_RUNTIME_DIR is not set anyway without logind and dbus around this isn't really any limitation. This also simplifies linking a bit as this means user-runtime-dir doesn't have to link against any code of logind itself.
This commit is contained in:
parent
3d0ef5c7e0
commit
07ee5adb35
16
meson.build
16
meson.build
|
@ -1762,15 +1762,15 @@ if conf.get('ENABLE_LOGIND') == 1
|
||||||
args : pam_systemd.full_path())
|
args : pam_systemd.full_path())
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
executable('systemd-user-runtime-dir',
|
executable('systemd-user-runtime-dir',
|
||||||
user_runtime_dir_sources,
|
user_runtime_dir_sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
link_with : [libshared, liblogind_core],
|
link_with : [libshared],
|
||||||
install_rpath : rootlibexecdir,
|
install_rpath : rootlibexecdir,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : rootlibexecdir)
|
install_dir : rootlibexecdir)
|
||||||
|
endif
|
||||||
|
|
||||||
if conf.get('HAVE_PAM') == 1
|
if conf.get('HAVE_PAM') == 1
|
||||||
executable('systemd-user-sessions',
|
executable('systemd-user-sessions',
|
||||||
|
|
|
@ -58,7 +58,6 @@ loginctl_sources = files('''
|
||||||
|
|
||||||
user_runtime_dir_sources = files('''
|
user_runtime_dir_sources = files('''
|
||||||
user-runtime-dir.c
|
user-runtime-dir.c
|
||||||
logind.h
|
|
||||||
'''.split())
|
'''.split())
|
||||||
|
|
||||||
if conf.get('ENABLE_LOGIND') == 1
|
if conf.get('ENABLE_LOGIND') == 1
|
||||||
|
|
|
@ -3,9 +3,11 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <sys/mount.h>
|
#include <sys/mount.h>
|
||||||
|
|
||||||
|
#include "sd-bus.h"
|
||||||
|
|
||||||
|
#include "bus-error.h"
|
||||||
#include "fs-util.h"
|
#include "fs-util.h"
|
||||||
#include "label.h"
|
#include "label.h"
|
||||||
#include "logind.h"
|
|
||||||
#include "mkdir.h"
|
#include "mkdir.h"
|
||||||
#include "mount-util.h"
|
#include "mount-util.h"
|
||||||
#include "path-util.h"
|
#include "path-util.h"
|
||||||
|
@ -17,21 +19,28 @@
|
||||||
#include "strv.h"
|
#include "strv.h"
|
||||||
#include "user-util.h"
|
#include "user-util.h"
|
||||||
|
|
||||||
static int gather_configuration(size_t *runtime_dir_size) {
|
static int acquire_runtime_dir_size(uint64_t *ret) {
|
||||||
Manager m = {};
|
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||||
|
_cleanup_(sd_bus_unrefp) sd_bus *bus = NULL;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
manager_reset_config(&m);
|
r = sd_bus_default_system(&bus);
|
||||||
|
|
||||||
r = manager_parse_config_file(&m);
|
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
log_warning_errno(r, "Failed to parse logind.conf: %m");
|
return log_error_errno(r, "Failed to connect to system bus: %m");
|
||||||
|
|
||||||
|
r = sd_bus_get_property_trivial(bus, "org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "RuntimeDirectorySize", &error, 't', ret);
|
||||||
|
if (r < 0)
|
||||||
|
return log_error_errno(r, "Failed to acquire runtime directory size: %s", bus_error_message(&error, r));
|
||||||
|
|
||||||
*runtime_dir_size = m.runtime_dir_size;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int user_mkdir_runtime_path(const char *runtime_path, uid_t uid, gid_t gid, size_t runtime_dir_size) {
|
static int user_mkdir_runtime_path(
|
||||||
|
const char *runtime_path,
|
||||||
|
uid_t uid,
|
||||||
|
gid_t gid,
|
||||||
|
uint64_t runtime_dir_size) {
|
||||||
|
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
assert(runtime_path);
|
assert(runtime_path);
|
||||||
|
@ -49,10 +58,10 @@ static int user_mkdir_runtime_path(const char *runtime_path, uid_t uid, gid_t gi
|
||||||
char options[sizeof("mode=0700,uid=,gid=,size=,smackfsroot=*")
|
char options[sizeof("mode=0700,uid=,gid=,size=,smackfsroot=*")
|
||||||
+ DECIMAL_STR_MAX(uid_t)
|
+ DECIMAL_STR_MAX(uid_t)
|
||||||
+ DECIMAL_STR_MAX(gid_t)
|
+ DECIMAL_STR_MAX(gid_t)
|
||||||
+ DECIMAL_STR_MAX(size_t)];
|
+ DECIMAL_STR_MAX(uint64_t)];
|
||||||
|
|
||||||
xsprintf(options,
|
xsprintf(options,
|
||||||
"mode=0700,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu%s",
|
"mode=0700,uid=" UID_FMT ",gid=" GID_FMT ",size=%" PRIu64 "%s",
|
||||||
uid, gid, runtime_dir_size,
|
uid, gid, runtime_dir_size,
|
||||||
mac_smack_use() ? ",smackfsroot=*" : "");
|
mac_smack_use() ? ",smackfsroot=*" : "");
|
||||||
|
|
||||||
|
@ -113,7 +122,7 @@ static int user_remove_runtime_path(const char *runtime_path) {
|
||||||
|
|
||||||
static int do_mount(const char *user) {
|
static int do_mount(const char *user) {
|
||||||
char runtime_path[sizeof("/run/user") + DECIMAL_STR_MAX(uid_t)];
|
char runtime_path[sizeof("/run/user") + DECIMAL_STR_MAX(uid_t)];
|
||||||
size_t runtime_dir_size;
|
uint64_t runtime_dir_size;
|
||||||
uid_t uid;
|
uid_t uid;
|
||||||
gid_t gid;
|
gid_t gid;
|
||||||
int r;
|
int r;
|
||||||
|
@ -126,9 +135,11 @@ static int do_mount(const char *user) {
|
||||||
: "Failed to look up user \"%s\": %m",
|
: "Failed to look up user \"%s\": %m",
|
||||||
user);
|
user);
|
||||||
|
|
||||||
xsprintf(runtime_path, "/run/user/" UID_FMT, uid);
|
r = acquire_runtime_dir_size(&runtime_dir_size);
|
||||||
|
if (r < 0)
|
||||||
|
return r;
|
||||||
|
|
||||||
assert_se(gather_configuration(&runtime_dir_size) == 0);
|
xsprintf(runtime_path, "/run/user/" UID_FMT, uid);
|
||||||
|
|
||||||
log_debug("Will mount %s owned by "UID_FMT":"GID_FMT, runtime_path, uid, gid);
|
log_debug("Will mount %s owned by "UID_FMT":"GID_FMT, runtime_path, uid, gid);
|
||||||
return user_mkdir_runtime_path(runtime_path, uid, gid, runtime_dir_size);
|
return user_mkdir_runtime_path(runtime_path, uid, gid, runtime_dir_size);
|
||||||
|
|
|
@ -8,9 +8,9 @@
|
||||||
# (at your option) any later version.
|
# (at your option) any later version.
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=User runtime directory /run/user/%i
|
Description=User Runtime Directory /run/user/%i
|
||||||
Documentation=man:user@.service(5)
|
Documentation=man:user@.service(5)
|
||||||
After=systemd-user-sessions.service
|
After=systemd-user-sessions.service dbus.service
|
||||||
StopWhenUnneeded=yes
|
StopWhenUnneeded=yes
|
||||||
IgnoreOnIsolate=yes
|
IgnoreOnIsolate=yes
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue