core: accept system mode emergency action specifiers with a warning

Before we would only accept those "system" values, so there wasn't other
chocie. Let's provide backwards compatiblity in case somebody made use of
this functionality in user mode.

v2: use 'exit-force' not 'exit'
v3: use error value in log_syntax

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index b4299c5882cc85866b1201653f3bfc92d2477485..bfd1d5b15f09bd2d0865584c77c86866ba80905c 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -4212,6 +4212,16 @@ int config_parse_emergency_action(
 
         r = parse_emergency_action(rvalue, MANAGER_IS_SYSTEM(m), x);
         if (r < 0) {
+                if (r == -EOPNOTSUPP && MANAGER_IS_USER(m)) {
+                        /* Compat mode: remove for systemd 241. */
+
+                        log_syntax(unit, LOG_INFO, filename, line, r,
+                                   "%s= in user mode specified as \"%s\", using \"exit-force\" instead.",
+                                   lvalue, rvalue);
+                        *x = EMERGENCY_ACTION_EXIT_FORCE;
+                        return 0;
+                }
+
                 if (r == -EOPNOTSUPP)
                         log_syntax(unit, LOG_ERR, filename, line, r,
                                    "%s= specified as %s mode action, ignoring: %s",