From: Zbigniew Jędrzejewski-Szmek Date: Thu, 25 Jun 2020 16:23:47 +0000 (+0200) Subject: Merge pull request #15697 from OhNoMoreGit/fix-path-units X-Git-Tag: v246-rc1~92 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98506a41fe4c3e1bd99b25ed1f33d02ee90328ee;p=thirdparty%2Fsystemd.git Merge pull request #15697 from OhNoMoreGit/fix-path-units Recheck PathExists=, PathExistsGlob=, DirectoryNotEmpty= when triggered unit terminates --- 98506a41fe4c3e1bd99b25ed1f33d02ee90328ee diff --cc src/core/path.c index 1bbf27c5c57,a98a0a14e96..1c3c28e3417 --- a/src/core/path.c +++ b/src/core/path.c @@@ -613,11 -615,10 +615,11 @@@ static int path_serialize(Unit *u, FIL if (!escaped) return log_oom(); + assert_se(type = path_type_to_string(s->type)); (void) serialize_item_format(f, "path-spec", "%s %i %s", - path_type_to_string(s->type), + type, s->previous_exists, - s->path); + escaped); } return 0;