meson: rename RC_LOCAL_PATH -> SYSTEM_SYSVRCLOCAL_PATH

No functional change, but just for emphasizing that this is for
SysV compatibility.

diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in
index b1f401bc900d0c90683bb3ba5c103d33828d0a52..3e39542bbc4e75646efcd962351d85066e040368 100644 (file)
--- a/man/custom-entities.ent.in
+++ b/man/custom-entities.ent.in
@@ -11,7 +11,7 @@
 <!ENTITY MEMORY_ACCOUNTING_DEFAULT "{{ 'yes' if MEMORY_ACCOUNTING_DEFAULT else 'no' }}">
 <!ENTITY KILL_USER_PROCESSES "{{ 'yes' if KILL_USER_PROCESSES else 'no' }}">
 <!ENTITY DEBUGTTY "{{DEBUGTTY}}">
-<!ENTITY RC_LOCAL_PATH "{{RC_LOCAL_PATH}}">
+<!ENTITY SYSTEM_SYSVRCLOCAL_PATH "{{SYSTEM_SYSVRCLOCAL_PATH}}">
 <!ENTITY HIGH_RLIMIT_NOFILE "{{HIGH_RLIMIT_NOFILE}}">
 <!ENTITY DEFAULT_DNSSEC_MODE "{{DEFAULT_DNSSEC_MODE_STR}}">
 <!ENTITY DEFAULT_DNS_OVER_TLS_MODE "{{DEFAULT_DNS_OVER_TLS_MODE_STR}}">

diff --git a/man/systemd-rc-local-generator.xml b/man/systemd-rc-local-generator.xml
index 882c5d6e7d1b4d21e8123a17bc311170d930c7f1..ff384d1b27364c1b35990bb33f1cec3fb5c78216 100644 (file)
--- a/man/systemd-rc-local-generator.xml
+++ b/man/systemd-rc-local-generator.xml
@@ -20,7 +20,7 @@
   <refnamediv>
     <refname>systemd-rc-local-generator</refname>
     <refname>rc-local.service</refname>
-    <refpurpose>Compatibility generator and service to start <filename>&RC_LOCAL_PATH;</filename> during boot</refpurpose>
+    <refpurpose>Compatibility generator and service to start <filename>&SYSTEM_SYSVRCLOCAL_PATH;</filename> during boot</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
@@ -32,7 +32,7 @@
     <title>Description</title>
 
     <para><command>systemd-rc-local-generator</command> is a generator that checks whether
-    <filename>&RC_LOCAL_PATH;</filename> exists and is executable, and if it is, pulls the
+    <filename>&SYSTEM_SYSVRCLOCAL_PATH;</filename> exists and is executable, and if it is, pulls the
     <filename>rc-local.service</filename> unit into the boot process. This unit is responsible for running
     this script during late boot. The script is run after <filename>network.target</filename>, but in
     parallel with most other regular system services.</para>
@@ -53,7 +53,7 @@ Wants=network-online.target
 After=network-online.target
 </programlisting>
 
-    <para>Support for <filename>&RC_LOCAL_PATH;</filename> is provided for compatibility with specific
+    <para>Support for <filename>&SYSTEM_SYSVRCLOCAL_PATH;</filename> is provided for compatibility with specific
     System V systems only. However, it is strongly recommended to avoid using this script today, and instead
     provide proper unit files with appropriate dependencies for any scripts to run during the boot process.
     Note that the path to the script is set at compile time and varies between distributions.</para>
@@ -66,7 +66,7 @@ After=network-online.target
     <title>Notes</title>
 
     <para>On systems with SELinux, when creating the file, make sure to set the appropriate context, e.g.
-    with "<command>sudo restorecon -v &RC_LOCAL_PATH;</command>".
+    with "<command>sudo restorecon -v &SYSTEM_SYSVRCLOCAL_PATH;</command>".
     </para>
   </refsect1>
 

diff --git a/meson.build b/meson.build
index 3357df3d319a4d5e3af8251b4e23a9eac58d7891..f25ad1a27ef8b3ed205983b8ca9c7029839c9d31 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -262,7 +262,6 @@ conf.set_quoted('PREFIX',                                     prefixdir)
 conf.set_quoted('PREFIX_NOSLASH',                             prefixdir_noslash)
 conf.set_quoted('RANDOM_SEED',                                randomseeddir / 'random-seed')
 conf.set_quoted('RANDOM_SEED_DIR',                            randomseeddir)
-conf.set_quoted('RC_LOCAL_PATH',                              get_option('rc-local'))
 conf.set_quoted('SSHCONFDIR',                                 sshconfdir)
 conf.set_quoted('SSHDCONFDIR',                                sshdconfdir)
 conf.set_quoted('SHELLPROFILEDIR',                            shellprofiledir)
@@ -303,6 +302,7 @@ conf.set_quoted('SYSTEM_SHUTDOWN_PATH',                       systemshutdowndir)
 conf.set_quoted('SYSTEM_SLEEP_PATH',                          systemsleepdir)
 conf.set_quoted('SYSTEM_SYSVINIT_PATH',                       sysvinit_path)
 conf.set_quoted('SYSTEM_SYSVRCND_PATH',                       sysvrcnd_path)
+conf.set_quoted('SYSTEM_SYSVRCLOCAL_PATH',                    sysvrclocal_path)
 conf.set_quoted('SYSUSERS_DIR',                               sysusersdir)
 conf.set_quoted('TMPFILES_DIR',                               tmpfilesdir)
 conf.set_quoted('USER_TMPFILES_DIR',                          usertmpfilesdir)
@@ -2930,6 +2930,7 @@ summary({
         'lib directory' :                   libdir,
         'SysV init scripts' :               sysvinit_path,
         'SysV rc?.d directories' :          sysvrcnd_path,
+        'SysV rc.local script' :            sysvrclocal_path,
         'PAM modules directory' :           pamlibdir,
         'PAM configuration directory' :     pamconfdir,
         'ssh server configuration directory' : sshdconfdir,
@@ -2946,7 +2947,6 @@ summary({
         'bash completions directory' :      bashcompletiondir,
         'zsh completions directory' :       zshcompletiondir,
         'private shared lib version tag' :  shared_lib_tag,
-        'extra start script' :              get_option('rc-local'),
         'debug shell' :                     '@0@ @ @1@'.format(get_option('debug-shell'),
                                                                get_option('debug-tty')),
         'system UIDs' :                     '<=@0@ (alloc >=@1@)'.format(conf.get('SYSTEM_UID_MAX'),

diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index 89cc5fadb6ae9c643e3b05c8f62d295fb5724945..53ea23215edcafdb72b8a61fcd62af6444e1e12f 100644 (file)
--- a/src/rc-local-generator/rc-local-generator.c
+++ b/src/rc-local-generator/rc-local-generator.c
@@ -64,7 +64,7 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
                 return EXIT_SUCCESS;
         }
 
-        if (check_executable(RC_LOCAL_PATH) >= 0) {
+        if (check_executable(SYSTEM_SYSVRCLOCAL_PATH) >= 0) {
                 log_debug("Automatically adding rc-local.service.");
 
                 r = add_symlink("rc-local.service", "multi-user.target");

diff --git a/units/rc-local.service.in b/units/rc-local.service.in
index 6fb0838cdb46971a60af8429b66ec1194a14edab..b135f3894de3657030616760dfcd59c462982d32 100644 (file)
--- a/units/rc-local.service.in
+++ b/units/rc-local.service.in
@@ -8,16 +8,16 @@
 #  (at your option) any later version.
 
 # This unit gets pulled automatically into multi-user.target by
-# systemd-rc-local-generator if {{RC_LOCAL_PATH}} is executable.
+# systemd-rc-local-generator if {{SYSTEM_SYSVRCLOCAL_PATH}} is executable.
 [Unit]
-Description={{RC_LOCAL_PATH}} Compatibility
+Description={{SYSTEM_SYSVRCLOCAL_PATH}} Compatibility
 Documentation=man:systemd-rc-local-generator(8)
-ConditionFileIsExecutable={{RC_LOCAL_PATH}}
+ConditionFileIsExecutable={{SYSTEM_SYSVRCLOCAL_PATH}}
 After=network.target
 
 [Service]
 Type=forking
-ExecStart={{RC_LOCAL_PATH}} start
+ExecStart={{SYSTEM_SYSVRCLOCAL_PATH}} start
 TimeoutSec=infinity
 RemainAfterExit=yes
 GuessMainPID=no