mirror of
https://github.com/systemd/systemd
synced 2024-10-07 08:40:44 +00:00
load-fragment: remove EmergencyAction compat we were supposed to remove back in v241
This commit is contained in:
parent
46730cd632
commit
2ae6917a1a
|
@ -5596,16 +5596,6 @@ int config_parse_emergency_action(
|
||||||
|
|
||||||
r = parse_emergency_action(rvalue, MANAGER_IS_SYSTEM(m), x);
|
r = parse_emergency_action(rvalue, MANAGER_IS_SYSTEM(m), x);
|
||||||
if (r < 0) {
|
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)
|
if (r == -EOPNOTSUPP)
|
||||||
log_syntax(unit, LOG_WARNING, filename, line, r,
|
log_syntax(unit, LOG_WARNING, filename, line, r,
|
||||||
"%s= specified as %s mode action, ignoring: %s",
|
"%s= specified as %s mode action, ignoring: %s",
|
||||||
|
|
Loading…
Reference in a new issue