From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Mon, 17 Nov 2025 14:58:27 +0000 (+0000)
Subject: rc-local and sysvinit are independent, adjust meson/units/docs
X-Git-Tag: v260-rc1~422^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b3a86f6c3b543d346fe965e53da1ef23a3a04aa;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/man/rules/meson.build b/man/rules/meson.build
index 1117026bcaa..6bc89398c83 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -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'],
diff --git a/man/systemd-rc-local-generator.xml b/man/systemd-rc-local-generator.xml
index ff384d1b273..a2ea8a9d149 100644
--- a/man/systemd-rc-local-generator.xml
+++ b/man/systemd-rc-local-generator.xml
@@ -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>
diff --git a/src/rc-local-generator/meson.build b/src/rc-local-generator/meson.build
index 62daab28463..b3a73117f89 100644
--- a/src/rc-local-generator/meson.build
+++ b/src/rc-local-generator/meson.build
@@ -5,7 +5,6 @@ executables += [
                 'name' : 'systemd-rc-local-generator',
                 'sources' : files('rc-local-generator.c'),
                 'conditions' : [
-                        'HAVE_SYSV_COMPAT',
                         'HAVE_SYSV_RC_LOCAL',
                 ],
         },
diff --git a/units/console-getty.service.in b/units/console-getty.service.in
index 278048724f7..aecb8f09481 100644
--- a/units/console-getty.service.in
+++ b/units/console-getty.service.in
@@ -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
diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in
index 18e5a98a7ff..6e0e59d396f 100644
--- a/units/container-getty@.service.in
+++ b/units/container-getty@.service.in
@@ -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
diff --git a/units/getty@.service.in b/units/getty@.service.in
index 15f1a572fd0..e9ca6401eed 100644
--- a/units/getty@.service.in
+++ b/units/getty@.service.in
@@ -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 %}
 
diff --git a/units/meson.build b/units/meson.build
index ddaefc56e8c..25e98ae90e2 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -176,7 +176,7 @@ units = [
         },
         {
           'file' : 'rc-local.service.in',
-          'conditions' : ['HAVE_SYSV_COMPAT'],
+          'conditions' : ['HAVE_SYSV_RC_LOCAL'],
         },
         {
           'file' : 'reboot.target',
diff --git a/units/serial-getty@.service.in b/units/serial-getty@.service.in
index 8b5a63d681f..c0708f17776 100644
--- a/units/serial-getty@.service.in
+++ b/units/serial-getty@.service.in
@@ -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 %}