From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 22 May 2018 09:56:31 +0000 (+0200)
Subject: Generator dirs might be on a real filesystem
X-Git-Tag: v239~225^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=114110cdf1a0ddba8238e0e10c520039281c5d6e;p=thirdparty%2Fsystemd.git

Generator dirs might be on a real filesystem

Most of the time, tmpfs is used for /tmp, but this is not required.
Applied to both pid1 and systemd-analyze verify.

Fixes #8592.
---

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 95c40cc91da..9919b2f2c28 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -828,14 +828,14 @@ void lookup_paths_flush_generator(LookupPaths *p) {
         /* Flush the generated unit files in full */
 
         if (p->generator)
-                (void) rm_rf(p->generator, REMOVE_ROOT);
+                (void) rm_rf(p->generator, REMOVE_ROOT|REMOVE_PHYSICAL);
         if (p->generator_early)
-                (void) rm_rf(p->generator_early, REMOVE_ROOT);
+                (void) rm_rf(p->generator_early, REMOVE_ROOT|REMOVE_PHYSICAL);
         if (p->generator_late)
-                (void) rm_rf(p->generator_late, REMOVE_ROOT);
+                (void) rm_rf(p->generator_late, REMOVE_ROOT|REMOVE_PHYSICAL);
 
         if (p->temporary_dir)
-                (void) rm_rf(p->temporary_dir, REMOVE_ROOT);
+                (void) rm_rf(p->temporary_dir, REMOVE_ROOT|REMOVE_PHYSICAL);
 }
 
 char **generator_binary_paths(UnitFileScope scope) {