diff options
| author | Lennart Poettering <lennart@poettering.net> | 2024-09-06 16:30:54 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2024-09-09 19:03:48 +0200 |
| commit | 229d4a980607e9478cf1935793652ddd9a14618b (patch) | |
| tree | 67a8fa54e607e3d1aa16427829dda3dcc08f87f9 /meson.build | |
| parent | machinectl: suppress redirection notice if --quiet is specified (diff) | |
| download | systemd-229d4a980607e9478cf1935793652ddd9a14618b.tar.xz systemd-229d4a980607e9478cf1935793652ddd9a14618b.zip | |
shell: define three system credentials we can propagate into shell prompts and welcome messages
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/meson.build b/meson.build index c26302d25c..80e0047281 100644 --- a/meson.build +++ b/meson.build @@ -188,7 +188,7 @@ mimepackagesdir = prefixdir / 'share/mime/packages' configfiledir = get_option('configfiledir') if configfiledir == '' - configfiledir= sysconfdir + configfiledir = sysconfdir endif pkgconfigfiledir = configfiledir / 'systemd' @@ -228,6 +228,13 @@ if libcryptsetup_plugins_dir == '' libcryptsetup_plugins_dir = libdir / 'cryptsetup' endif +shellprofiledir = get_option('shellprofiledir') +if shellprofiledir == '' + shellprofiledir = sysconfdir / 'profile.d' +endif +conf.set10('LINK_SHELL_EXTRA_DROPIN', shellprofiledir != 'no' and not shellprofiledir.startswith('/usr/')) +conf.set('SHELLPROFILEDIR', shellprofiledir, description : 'shell profile directory') + memory_accounting_default = get_option('memory-accounting-default') status_unit_format_default = get_option('status-unit-format-default') if status_unit_format_default == 'auto' @@ -257,6 +264,7 @@ conf.set_quoted('RANDOM_SEED_DIR', randomseeddir) conf.set_quoted('RC_LOCAL_PATH', get_option('rc-local')) conf.set_quoted('SSHCONFDIR', sshconfdir) conf.set_quoted('SSHDCONFDIR', sshdconfdir) +conf.set_quoted('SHELLPROFILEDIR', shellprofiledir) conf.set_quoted('SYSCONF_DIR', sysconfdir) conf.set_quoted('SYSCTL_DIR', sysctldir) conf.set_quoted('SYSTEMCTL_BINARY_PATH', bindir / 'systemctl') @@ -2701,6 +2709,7 @@ subdir('man') subdir('modprobe.d') subdir('network') subdir('presets') +subdir('profile.d') subdir('shell-completion/bash') subdir('shell-completion/zsh') subdir('sysctl.d') @@ -2923,6 +2932,7 @@ summary({ 'ssh server privilege separation directory' : sshdprivsepdir, 'ssh client configuration directory' : sshconfdir, 'libcryptsetup plugins directory' : libcryptsetup_plugins_dir, + 'Shell profile directory' : shellprofiledir, 'RPM macros directory' : rpmmacrosdir, 'modprobe.d directory' : modprobedir, 'D-Bus policy directory' : dbuspolicydir, |