]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
load-fragment: remove EmergencyAction compat we were supposed to remove back in v241
authorLennart Poettering <lennart@poettering.net>
Thu, 5 Jan 2023 09:34:52 +0000 (10:34 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 6 Jan 2023 15:15:30 +0000 (16:15 +0100)
src/core/load-fragment.c

index 24d402b6e5f0b28e1dac6b7786ca7b8d1e638187..7b58e4ff7b48d87e0739494d2213a1f0515549d9 100644 (file)
@@ -5596,16 +5596,6 @@ 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_WARNING, filename, line, r,
                                    "%s= specified as %s mode action, ignoring: %s",