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 1117026bcaadd531e78c214c5496ec4fc0988326..6bc89398c830534be62a80767414b9ba2a508cbe 100644 (file)
--- 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 ff384d1b27364c1b35990bb33f1cec3fb5c78216..a2ea8a9d14972599004988287fc62ec9b05ace0a 100644 (file)
--- 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 62daab2846370dc32fb407e0be05249ef6735161..b3a73117f89d3dec603bad3635116e8c639097c4 100644 (file)
--- 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 278048724f713e4abb507e86682d2917fbda1475..aecb8f09481cd6467ab070e22463c6595d9da75c 100644 (file)
--- 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 18e5a98a7ff4f507860e5adf3eb526d2276c12a9..6e0e59d396fac52a6e5a2360878b303125d9c029 100644 (file)
--- 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 15f1a572fd04760a824a5f77097860e927a06a31..e9ca6401eed0cc1c93319e39b38888ddf7418a14 100644 (file)
--- 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 ddaefc56e8cc5150fc73b230c7faa1f7295c6508..25e98ae90e2ed122a86dff8fff79f55d02a7918d 100644 (file)
--- 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 8b5a63d681f4310000422675411ef8bc4e9803eb..c0708f17776643ac8839e0182c9d0f8dd694d7b0 100644 (file)
--- 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 %}