potatOS
/
potatOS-for-linux
mirror of https://github.com/systemd/systemd
1
0
Fork 0
Code Issues Releases Wiki Activity

meson: disable rc-local-generator when an empty string is specified to rc-local= meson option 

In such case, the generator is meaningless. Let's kill it.
This commit is contained in:
Yu Watanabe 2025-04-02 22:09:12 +09:00
parent b0c9ba4eb1
commit 74f25ea7a9
5 changed files with 13 additions and 5 deletions

5
man/rules/meson.build
View File

@ -1071,7 +1071,10 @@ manpages = [
'8', '8',
['systemd-random-seed'], ['systemd-random-seed'],
'ENABLE_RANDOMSEED'], 'ENABLE_RANDOMSEED'],
['systemd-rc-local-generator', '8', ['rc-local.service'], 'HAVE_SYSV_COMPAT'], ['systemd-rc-local-generator',
'8',
['rc-local.service'],
'HAVE_SYSV_COMPAT HAVE_SYSV_RC_LOCAL'],
['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''], ['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''],
['systemd-repart', '8', ['systemd-repart.service'], 'ENABLE_REPART'], ['systemd-repart', '8', ['systemd-repart.service'], 'ENABLE_REPART'],
['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVE'], ['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVE'],

2
man/systemd-rc-local-generator.xml
View File

@ -6,7 +6,7 @@
]> ]>
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-rc-local-generator" conditional='HAVE_SYSV_COMPAT'> <refentry id="systemd-rc-local-generator" conditional='HAVE_SYSV_COMPAT HAVE_SYSV_RC_LOCAL'>
<refentryinfo> <refentryinfo>
<title>systemd-rc-local-generator</title> <title>systemd-rc-local-generator</title>
<productname>systemd</productname> <productname>systemd</productname>

2
meson.build
View File

@ -94,6 +94,8 @@ sysvinit_path = get_option('sysvinit-path')
sysvrcnd_path = get_option('sysvrcnd-path') sysvrcnd_path = get_option('sysvrcnd-path')
conf.set10('HAVE_SYSV_COMPAT', sysvinit_path != '' and sysvrcnd_path != '', conf.set10('HAVE_SYSV_COMPAT', sysvinit_path != '' and sysvrcnd_path != '',
description : 'SysV init scripts and rcN.d links are supported') description : 'SysV init scripts and rcN.d links are supported')
sysvrclocal_path = get_option('rc-local')
conf.set10('HAVE_SYSV_RC_LOCAL', sysvrclocal_path != '')
conf.set10('CREATE_LOG_DIRS', get_option('create-log-dirs')) conf.set10('CREATE_LOG_DIRS', get_option('create-log-dirs'))
if get_option('hibernate') and not get_option('initrd') if get_option('hibernate') and not get_option('initrd')

4
meson_options.txt
View File

@ -45,8 +45,8 @@ option('sysvinit-path', type : 'string', value : '/etc/init.d',
description : 'the directory where the SysV init scripts are located') description : 'the directory where the SysV init scripts are located')
option('sysvrcnd-path', type : 'string', value : '/etc/rc.d', option('sysvrcnd-path', type : 'string', value : '/etc/rc.d',
description : 'the base directory for SysV rcN.d directories') description : 'the base directory for SysV rcN.d directories')
option('rc-local', type : 'string', option('rc-local', type : 'string', value : '/etc/rc.local',
value : '/etc/rc.local') description : 'path to SysV rc.local script')
option('initrd', type : 'boolean', option('initrd', type : 'boolean',
description : 'install services for use when running systemd in initrd') description : 'install services for use when running systemd in initrd')
option('compat-mutable-uid-boundaries', type : 'boolean', value : false, option('compat-mutable-uid-boundaries', type : 'boolean', value : false,

5
src/rc-local-generator/meson.build
View File

@ -3,7 +3,10 @@
executables += [ executables += [
generator_template + { generator_template + {
'name' : 'systemd-rc-local-generator', 'name' : 'systemd-rc-local-generator',
'conditions' : ['HAVE_SYSV_COMPAT'],
'sources' : files('rc-local-generator.c'), 'sources' : files('rc-local-generator.c'),
'conditions' : [
'HAVE_SYSV_COMPAT',
'HAVE_SYSV_RC_LOCAL',
],
}, },
] ]