daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
65878a
From e409d591e0d9ae65d351cf32ae7cb79def50f009 Mon Sep 17 00:00:00 2001
65878a
From: Lennart Poettering <lennart@poettering.net>
65878a
Date: Wed, 9 Oct 2013 00:13:55 +0200
65878a
Subject: [PATCH] core: unify the way we denote serialization attributes
65878a
65878a
---
65878a
 src/core/service.c | 6 +++---
65878a
 1 file changed, 3 insertions(+), 3 deletions(-)
65878a
65878a
diff --git a/src/core/service.c b/src/core/service.c
65878a
index 98b1599..96ed2d3 100644
65878a
--- a/src/core/service.c
65878a
+++ b/src/core/service.c
65878a
@@ -2652,7 +2652,7 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
65878a
                 unit_serialize_item(u, f, "var-tmp-dir", s->exec_context.var_tmp_dir);
65878a
 
65878a
         if (s->forbid_restart)
65878a
-                unit_serialize_item(u, f, "forbid_restart", yes_no(s->forbid_restart));
65878a
+                unit_serialize_item(u, f, "forbid-restart", yes_no(s->forbid_restart));
65878a
 
65878a
         return 0;
65878a
 }
65878a
@@ -2790,12 +2790,12 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
65878a
                         return log_oom();
65878a
 
65878a
                 s->exec_context.var_tmp_dir = t;
65878a
-        } else if (streq(key, "forbid_restart")) {
65878a
+        } else if (streq(key, "forbid-restart")) {
65878a
                 int b;
65878a
 
65878a
                 b = parse_boolean(value);
65878a
                 if (b < 0)
65878a
-                        log_debug_unit(u->id, "Failed to parse forbid_restart value %s", value);
65878a
+                        log_debug_unit(u->id, "Failed to parse forbid-restart value %s", value);
65878a
                 else
65878a
                         s->forbid_restart = b;
65878a
         } else