rc-local and sysvinit are independent, adjust meson/units/docs

They are separate and independent settings, so adjust meson rules
and unit files accordingly. It is possible to enable support for
rc-local script without support for sysvinit scripts, and viceversa.
This will become useful later when sysvinit scripts support is
removed.
This commit is contained in:
Luca Boccassi
2026-01-06 10:34:00 +01:00
parent 9573ad4e76
commit 5b3a86f6c3
8 changed files with 7 additions and 8 deletions
+1 -1
View File
@@ -1133,7 +1133,7 @@ manpages = [
['systemd-rc-local-generator',
'8',
['rc-local.service'],
'HAVE_SYSV_COMPAT HAVE_SYSV_RC_LOCAL'],
'HAVE_SYSV_RC_LOCAL'],
['systemd-remount-fs.service', '8', ['systemd-remount-fs'], ''],
['systemd-repart', '8', ['systemd-repart.service'], 'ENABLE_REPART'],
['systemd-resolved.service', '8', ['systemd-resolved'], 'ENABLE_RESOLVE'],
+1 -1
View File
@@ -6,7 +6,7 @@
]>
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-rc-local-generator" conditional='HAVE_SYSV_COMPAT HAVE_SYSV_RC_LOCAL'>
<refentry id="systemd-rc-local-generator" conditional='HAVE_SYSV_RC_LOCAL'>
<refentryinfo>
<title>systemd-rc-local-generator</title>
<productname>systemd</productname>
-1
View File
@@ -5,7 +5,6 @@ executables += [
'name' : 'systemd-rc-local-generator',
'sources' : files('rc-local-generator.c'),
'conditions' : [
'HAVE_SYSV_COMPAT',
'HAVE_SYSV_RC_LOCAL',
],
},
+1 -1
View File
@@ -11,7 +11,7 @@
Description=Console Getty
Documentation=man:agetty(8) man:systemd-getty-generator(8)
After=systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target
{% if HAVE_SYSV_COMPAT %}
{% if HAVE_SYSV_RC_LOCAL %}
After=rc-local.service
{% endif %}
Before=getty.target
+1 -1
View File
@@ -12,7 +12,7 @@ Description=Container Getty on /dev/pts/%I
Documentation=man:agetty(8) man:systemd-getty-generator(8)
Documentation=man:machinectl(1)
After=systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target
{% if HAVE_SYSV_COMPAT %}
{% if HAVE_SYSV_RC_LOCAL %}
After=rc-local.service
{% endif %}
Before=getty.target
+1 -1
View File
@@ -12,7 +12,7 @@ Description=Getty on %I
Documentation=man:agetty(8) man:systemd-getty-generator(8)
Documentation=https://0pointer.de/blog/projects/serial-console.html
After=systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target
{% if HAVE_SYSV_COMPAT %}
{% if HAVE_SYSV_RC_LOCAL %}
After=rc-local.service
{% endif %}
+1 -1
View File
@@ -176,7 +176,7 @@ units = [
},
{
'file' : 'rc-local.service.in',
'conditions' : ['HAVE_SYSV_COMPAT'],
'conditions' : ['HAVE_SYSV_RC_LOCAL'],
},
{
'file' : 'reboot.target',
+1 -1
View File
@@ -13,7 +13,7 @@ Documentation=man:agetty(8) man:systemd-getty-generator(8)
Documentation=https://0pointer.de/blog/projects/serial-console.html
BindsTo=dev-%i.device
After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target
{% if HAVE_SYSV_COMPAT %}
{% if HAVE_SYSV_RC_LOCAL %}
After=rc-local.service
{% endif %}