SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: guard symlinks in sysconfdir behind install_sysconfidr

Browse Source 
Symlinks to files inside sysconfdir are now only installed if
ìnstall_sysconfdir=true (which is the default).

If sshconfdir,sshdconfdir,shellprofiledir are not inside sysconfdir and
install_sysconfidr=false, these symlinks are still installed to the
configured directory.
This commit is contained in:
nikstur
2026-02-09 16:52:53 +01:00
committed by Daan De Meyer
parent 779ed358f2
commit 14519d7dfa
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
profile.d/meson.build
+2 -2
View File
@@ -3,7 +3,7 @@
install_data('70-systemd-shell-extra.sh', install_dir : shellprofiledir.startswith('/usr/') ? shellprofiledir : libexecdir / 'profile.d') install_data('70-systemd-shell-extra.sh', install_dir : shellprofiledir.startswith('/usr/') ? shellprofiledir : libexecdir / 'profile.d')
install_data('80-systemd-osc-context.sh', install_dir : shellprofiledir.startswith('/usr/') ? shellprofiledir : libexecdir / 'profile.d') install_data('80-systemd-osc-context.sh', install_dir : shellprofiledir.startswith('/usr/') ? shellprofiledir : libexecdir / 'profile.d')
if conf.get('LINK_SHELL_EXTRA_DROPIN') == 1 if (not shellprofiledir.startswith(sysconfdir) or install_sysconfdir) and conf.get('LINK_SHELL_EXTRA_DROPIN') == 1
if meson.version().version_compare('>=1.3.0') if meson.version().version_compare('>=1.3.0')
install_symlink( install_symlink(
'70-systemd-shell-extra.sh', '70-systemd-shell-extra.sh',
@@ -19,7 +19,7 @@ if conf.get('LINK_SHELL_EXTRA_DROPIN') == 1
endif endif
endif endif
if conf.get('LINK_OSC_CONTEXT_DROPIN') == 1 if (not shellprofiledir.startswith(sysconfdir) or install_sysconfdir) and conf.get('LINK_OSC_CONTEXT_DROPIN') == 1
if meson.version().version_compare('>=1.3.0') if meson.version().version_compare('>=1.3.0')
install_symlink( install_symlink(
'80-systemd-osc-context.sh', '80-systemd-osc-context.sh',
src/ssh-generator/meson.build
+1 -1
View File
@@ -25,7 +25,7 @@ if conf.get('ENABLE_SSH_PROXY_CONFIG') == 1
install : true, install : true,
install_dir : sshconfdir.startswith('/usr/') ? sshconfdir : libexecdir / 'ssh_config.d') install_dir : sshconfdir.startswith('/usr/') ? sshconfdir : libexecdir / 'ssh_config.d')
if conf.get('LINK_SSH_PROXY_DROPIN') == 1 if (not sshconfdir.startswith(sysconfdir) or install_sysconfdir) and conf.get('LINK_SSH_PROXY_DROPIN') == 1
if meson.version().version_compare('>=1.3.0') if meson.version().version_compare('>=1.3.0')
install_symlink( install_symlink(
'20-systemd-ssh-proxy.conf', '20-systemd-ssh-proxy.conf',
src/userdb/meson.build
+1 -1
View File
@@ -32,7 +32,7 @@ if conf.get('ENABLE_SSH_USERDB_CONFIG') == 1
install : true, install : true,
install_dir : sshdconfdir.startswith('/usr/') ? sshdconfdir : libexecdir / 'sshd_config.d') install_dir : sshdconfdir.startswith('/usr/') ? sshdconfdir : libexecdir / 'sshd_config.d')
if conf.get('LINK_SSHD_USERDB_DROPIN') == 1 if (not sshdconfdir.startswith(sysconfdir) or install_sysconfdir) and conf.get('LINK_SSHD_USERDB_DROPIN') == 1
if meson.version().version_compare('>=1.3.0') if meson.version().version_compare('>=1.3.0')
install_symlink( install_symlink(
'20-systemd-userdb.conf', '20-systemd-userdb.conf',