TODO

@@ -949,6 +949,8 @@ Features:
 
 * firstboot: make it useful to be run immediately after yum --installroot to set up a machine. (most specifically, make --copy-root-password work even if /etc/passwd already exists
 
+* maybe add support for specifier expansion in user.conf, specifically DefaultEnvironment=
+
 * maybe allow timer units with an empty Units= setting, so that they
   can be used for resuming the system but nothing else.
 

man/repart.d.xml

@@ -622,9 +622,7 @@
   <refsect1>
     <title>Specifiers</title>
 
-    <para>Specifiers may be used in the <varname>Label=</varname>, <varname>CopyBlocks=</varname>,
+    <para>Specifiers may be used in the <varname>Label=</varname> setting. The following expansions are understood:</para>
-    <varname>CopyFiles=</varname>, <varname>MakeDirectories=</varname> settings. The following expansions are
-    understood:</para>
       <table class='specifiers'>
         <title>Specifiers available</title>
         <tgroup cols='3' align='left' colsep='1' rowsep='1'>
@@ -651,8 +649,6 @@
             <xi:include href="standard-specifiers.xml" xpointer="v"/>
             <xi:include href="standard-specifiers.xml" xpointer="w"/>
             <xi:include href="standard-specifiers.xml" xpointer="W"/>
-            <xi:include href="standard-specifiers.xml" xpointer="T"/>
-            <xi:include href="standard-specifiers.xml" xpointer="V"/>
             <xi:include href="standard-specifiers.xml" xpointer="percent"/>
           </tbody>
         </tgroup>

man/systemd-system.conf.xml

@@ -328,9 +328,6 @@
         project='man-pages'><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
         details about environment variables.</para>
 
-        <para>Simple <literal>%</literal>-specifier expansion is supported, see below for a list of supported
-        specifiers.</para>
-
         <para>Example:
 
         <programlisting>DefaultEnvironment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"</programlisting>
@@ -352,11 +349,7 @@
 
         <para>Setting environment variables for the manager process may be useful to modify its behaviour.
         See <ulink url="https://systemd.io/ENVIRONMENT">ENVIRONMENT</ulink> for a descriptions of some
-        variables understood by <command>systemd</command>.</para>
+        variables understood by <command>systemd</command>.</para></listitem>
-
-        <para>Simple <literal>%</literal>-specifier expansion is supported, see below for a list of supported
-        specifiers.</para>
-        </listitem>
       </varlistentry>
 
       <varlistentry>
@@ -447,45 +440,6 @@
     </variablelist>
   </refsect1>
 
-  <refsect1>
-    <title>Specifiers</title>
-
-    <para>Specifiers may be used in the <varname>DefaultEnvironment=</varname> and
-    <varname>ManagerEnvironment=</varname> settings. The following expansions are understood:</para>
-      <table class='specifiers'>
-        <title>Specifiers available</title>
-        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
-          <colspec colname="spec" />
-          <colspec colname="mean" />
-          <colspec colname="detail" />
-          <thead>
-            <row>
-              <entry>Specifier</entry>
-              <entry>Meaning</entry>
-              <entry>Details</entry>
-            </row>
-          </thead>
-          <tbody>
-            <xi:include href="standard-specifiers.xml" xpointer="a"/>
-            <xi:include href="standard-specifiers.xml" xpointer="A"/>
-            <xi:include href="standard-specifiers.xml" xpointer="b"/>
-            <xi:include href="standard-specifiers.xml" xpointer="B"/>
-            <xi:include href="standard-specifiers.xml" xpointer="H"/>
-            <xi:include href="standard-specifiers.xml" xpointer="l"/>
-            <xi:include href="standard-specifiers.xml" xpointer="m"/>
-            <xi:include href="standard-specifiers.xml" xpointer="M"/>
-            <xi:include href="standard-specifiers.xml" xpointer="o"/>
-            <xi:include href="standard-specifiers.xml" xpointer="v"/>
-            <xi:include href="standard-specifiers.xml" xpointer="w"/>
-            <xi:include href="standard-specifiers.xml" xpointer="W"/>
-            <xi:include href="standard-specifiers.xml" xpointer="T"/>
-            <xi:include href="standard-specifiers.xml" xpointer="V"/>
-            <xi:include href="standard-specifiers.xml" xpointer="percent"/>
-          </tbody>
-        </tgroup>
-      </table>
-  </refsect1>
-
   <refsect1>
       <title>See Also</title>
       <para>

src/core/load-fragment.c

@@ -57,7 +57,6 @@
 #include "signal-util.h"
 #include "socket-bind.h"
 #include "socket-netlink.h"
-#include "specifier.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
@@ -2657,15 +2656,15 @@ int config_parse_environ(
                 if (r == 0)
                         return 0;
 
-                if (u)
+                if (u) {
                         r = unit_env_printf(u, word, &resolved);
-                else
-                        r = specifier_printf(word, sc_arg_max(), system_and_tmp_specifier_table, NULL, &resolved);
                         if (r < 0) {
                                 log_syntax(unit, LOG_WARNING, filename, line, r,
-                                   "Failed to resolve specifiers in %s, ignoring: %m", word);
+                                           "Failed to resolve unit specifiers in %s, ignoring: %m", word);
                                 continue;
                         }
+                } else
+                        resolved = TAKE_PTR(word);
 
                 if (!env_assignment_is_valid(resolved)) {
                         log_syntax(unit, LOG_WARNING, filename, line, 0,

src/partition/repart.c

@@ -949,6 +949,11 @@ static int config_parse_type(
         return 0;
 }
 
+static const Specifier specifier_table[] = {
+        COMMON_SYSTEM_SPECIFIERS,
+        {}
+};
+
 static int config_parse_label(
                 const char *unit,
                 const char *filename,
@@ -971,7 +976,7 @@ static int config_parse_label(
         /* Nota bene: the empty label is a totally valid one. Let's hence not follow our usual rule of
          * assigning the empty string to reset to default here, but really accept it as label to set. */
 
-        r = specifier_printf(rvalue, GPT_LABEL_MAX, system_and_tmp_specifier_table, NULL, &resolved);
+        r = specifier_printf(rvalue, GPT_LABEL_MAX, specifier_table, NULL, &resolved);
         if (r < 0) {
                 log_syntax(unit, LOG_WARNING, filename, line, r,
                            "Failed to expand specifiers in Label=, ignoring: %s", rvalue);
@@ -1136,7 +1141,7 @@ static int config_parse_copy_files(
         if (!isempty(p))
                 return log_syntax(unit, LOG_ERR, filename, line, SYNTHETIC_ERRNO(EINVAL), "Too many arguments: %s", rvalue);
 
-        r = specifier_printf(source, PATH_MAX-1, system_and_tmp_specifier_table, NULL, &resolved_source);
+        r = specifier_printf(source, PATH_MAX-1, specifier_table, NULL, &resolved_source);
         if (r < 0) {
                 log_syntax(unit, LOG_WARNING, filename, line, r,
                            "Failed to expand specifiers in CopyFiles= source, ignoring: %s", rvalue);
@@ -1147,7 +1152,7 @@ static int config_parse_copy_files(
         if (r < 0)
                 return 0;
 
-        r = specifier_printf(target, PATH_MAX-1, system_and_tmp_specifier_table, NULL, &resolved_target);
+        r = specifier_printf(target, PATH_MAX-1, specifier_table, NULL, &resolved_target);
         if (r < 0) {
                 log_syntax(unit, LOG_WARNING, filename, line, r,
                            "Failed to expand specifiers in CopyFiles= target, ignoring: %s", resolved_target);
@@ -1196,7 +1201,7 @@ static int config_parse_copy_blocks(
                 return 0;
         }
 
-        r = specifier_printf(rvalue, PATH_MAX-1, system_and_tmp_specifier_table, NULL, &d);
+        r = specifier_printf(rvalue, PATH_MAX-1, specifier_table, NULL, &d);
         if (r < 0) {
                 log_syntax(unit, LOG_WARNING, filename, line, r,
                            "Failed to expand specifiers in CopyBlocks= source path, ignoring: %s", rvalue);
@@ -1244,7 +1249,7 @@ static int config_parse_make_dirs(
                 if (r == 0)
                         return 0;
 
-                r = specifier_printf(word, PATH_MAX-1, system_and_tmp_specifier_table, NULL, &d);
+                r = specifier_printf(word, PATH_MAX-1, specifier_table, NULL, &d);
                 if (r < 0) {
                         log_syntax(unit, LOG_WARNING, filename, line, r,
                                    "Failed to expand specifiers in MakeDirectories= parameter, ignoring: %s", word);

src/shared/specifier.c

@@ -364,9 +364,3 @@ int specifier_escape_strv(char **l, char ***ret) {
 
         return 0;
 }
-
-const Specifier system_and_tmp_specifier_table[] = {
-        COMMON_SYSTEM_SPECIFIERS,
-        COMMON_TMP_SPECIFIERS,
-        {}
-};

src/shared/specifier.h

@@ -80,6 +80,7 @@ int specifier_var_tmp_dir(char specifier, const void *data, const void *userdata
         { 'w', specifier_os_version_id,   NULL }, \
         { 'W', specifier_os_variant_id,   NULL }
 
+
 #define COMMON_CREDS_SPECIFIERS                   \
         { 'g', specifier_group_name,      NULL }, \
         { 'G', specifier_group_id,        NULL }, \
@@ -95,6 +96,3 @@ static inline char* specifier_escape(const char *string) {
 }
 
 int specifier_escape_strv(char **l, char ***ret);
-
-/* A generic specifier table consisting of COMMON_SYSTEM_SPECIFIERS and COMMON_TMP_SPECIFIERS */
-extern const Specifier system_and_tmp_specifier_table[];

src/sysusers/sysusers.c

@@ -1466,6 +1466,12 @@ static bool item_equal(Item *a, Item *b) {
 
 static int parse_line(const char *fname, unsigned line, const char *buffer) {
 
+        static const Specifier specifier_table[] = {
+                COMMON_SYSTEM_SPECIFIERS,
+                COMMON_TMP_SPECIFIERS,
+                {}
+        };
+
         _cleanup_free_ char *action = NULL,
                 *name = NULL, *resolved_name = NULL,
                 *id = NULL, *resolved_id = NULL,
@@ -1509,7 +1515,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
                 name = mfree(name);
 
         if (name) {
-                r = specifier_printf(name, NAME_MAX, system_and_tmp_specifier_table, NULL, &resolved_name);
+                r = specifier_printf(name, NAME_MAX, specifier_table, NULL, &resolved_name);
                 if (r < 0)
                         return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m", fname, line, name);
 
@@ -1524,7 +1530,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
                 id = mfree(id);
 
         if (id) {
-                r = specifier_printf(id, PATH_MAX-1, system_and_tmp_specifier_table, NULL, &resolved_id);
+                r = specifier_printf(id, PATH_MAX-1, specifier_table, NULL, &resolved_id);
                 if (r < 0)
                         return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m",
                                                fname, line, name);
@@ -1535,7 +1541,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
                 description = mfree(description);
 
         if (description) {
-                r = specifier_printf(description, LONG_LINE_MAX, system_and_tmp_specifier_table, NULL, &resolved_description);
+                r = specifier_printf(description, LONG_LINE_MAX, specifier_table, NULL, &resolved_description);
                 if (r < 0)
                         return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m",
                                                fname, line, description);
@@ -1551,7 +1557,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
                 home = mfree(home);
 
         if (home) {
-                r = specifier_printf(home, PATH_MAX-1, system_and_tmp_specifier_table, NULL, &resolved_home);
+                r = specifier_printf(home, PATH_MAX-1, specifier_table, NULL, &resolved_home);
                 if (r < 0)
                         return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m",
                                                fname, line, home);
@@ -1567,7 +1573,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
                 shell = mfree(shell);
 
         if (shell) {
-                r = specifier_printf(shell, PATH_MAX-1, system_and_tmp_specifier_table, NULL, &resolved_shell);
+                r = specifier_printf(shell, PATH_MAX-1, specifier_table, NULL, &resolved_shell);
                 if (r < 0)
                         return log_error_errno(r, "[%s:%u] Failed to replace specifiers in '%s': %m",
                                                fname, line, shell);