diff options
| author | Mike Gilbert <floppymaster@gmail.com> | 2018-01-04 07:14:20 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-01-04 13:14:20 +0100 |
| commit | 2fa645f1ccbbed95868b0f25017533c8de2bba2b (patch) | |
| tree | 0350669f25904cfb3df77e164097f3b8daabd94b /meson_options.txt | |
| parent | 3046b6db1d285a7aba2247b48f0cc98372defab6 (diff) | |
| download | systemd-2fa645f1ccbbed95868b0f25017533c8de2bba2b.tar.gz | |
meson: don't search PATH for telinit (#7770)
On a typical system running systemd, the telinit in PATH is very likely to be a symlink
to systemctl. Setting TELINIT to this may result in an infinite recursion if telinit is called
and sd_booted() == 0. This may commonly occur in a chroot environment.
Bug: https://bugs.gentoo.org/642724
[zj:
The path was originally hardcoded as "/lib/upstart/telinit", but was made configurable without
changing the default in 4ad61fd1806dde23d2c99043b4bed91a196d2c82. Then the default was
changed to `/lib/sysvinit/telinit` in abaaabf40a9891014ed4c402d7beb5a67ac256b1. Then it
started being autodetected when meson support was added in
5c23128daba7236a6080383b2a5649033cfef85c. This patch restores the behaviour that was
implemented in configure.ac at the time of its removal.]
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meson_options.txt b/meson_options.txt index f0c0506ff1..f71755cfa6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -29,7 +29,8 @@ option('sysvinit-path', type : 'string', value : '/etc/init.d', description : 'the directory where the SysV init scripts are located') option('sysvrcnd-path', type : 'string', value : '/etc/rc.d', description : 'the base directory for SysV rcN.d directories') -option('telinit-path', type : 'string', description : 'path to telinit') +option('telinit-path', type : 'string', value : '/lib/sysvinit/telinit', + description : 'path to telinit') option('rc-local', type : 'string', value : '/etc/rc.local') option('halt-local', type : 'string', |