unit: set default working directory to the user's home directory when running in...

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index eff75d033a8d43ace7c374a37b8907e6d18d5b53..291178679da85b533c35aca108e08edd52a26094 100644 (file)
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -89,8 +89,12 @@
 
                                 <listitem><para>Takes an absolute
                                 directory path. Sets the working
-                                directory for executed
-                                processes.</para></listitem>
+                                directory for executed processes. If
+                                not set defaults to the root directory
+                                when systemd is running as a system
+                                instance and the respective user's
+                                home directory if run as
+                                user.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/src/core/mount.c b/src/core/mount.c
index 15d5f215303376c40a688f9c2dada51fdac2e591..a88b255875203caa8b16b83a0704fb57ea33a403 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -631,6 +631,10 @@ static int mount_load(Unit *u) {
                 r = mount_add_extras(m);
                 if (r < 0)
                         return r;
+
+                r = unit_patch_working_directory(UNIT(m), &m->exec_context);
+                if (r < 0)
+                        return r;
         }
 
         return mount_verify(m);

diff --git a/src/core/service.c b/src/core/service.c
index 0a6658809e8b612ab468c48566fd9ecf5f24665e..7a7e25ffcd2f0aabb771966c935d5458140c69c2 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1282,6 +1282,10 @@ static int service_load(Unit *u) {
                 if (UNIT(s)->default_dependencies)
                         if ((r = service_add_default_dependencies(s)) < 0)
                                 return r;
+
+                r = unit_patch_working_directory(UNIT(s), &s->exec_context);
+                if (r < 0)
+                        return r;
         }
 
         return service_verify(s);

diff --git a/src/core/socket.c b/src/core/socket.c
index 3613e8420e2312928a7e47ea6ae99af6a6a49aa0..8153a8e76206b8093f2f28a66dde398ed780c597 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -372,6 +372,10 @@ static int socket_load(Unit *u) {
                 if (UNIT(s)->default_dependencies)
                         if ((r = socket_add_default_dependencies(s)) < 0)
                                 return r;
+
+                r = unit_patch_working_directory(UNIT(s), &s->exec_context);
+                if (r < 0)
+                        return r;
         }
 
         return socket_verify(s);

diff --git a/src/core/swap.c b/src/core/swap.c
index aeb8bdab36ef4723ec5cdc9a7da82b9c4644e873..ed61ba3c816493e466fca490966a38d4f5f3eaf7 100644 (file)
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -294,6 +294,10 @@ static int swap_load(Unit *u) {
                 if (UNIT(s)->default_dependencies)
                         if ((r = swap_add_default_dependencies(s)) < 0)
                                 return r;
+
+                r = unit_patch_working_directory(UNIT(s), &s->exec_context);
+                if (r < 0)
+                        return r;
         }
 
         return swap_verify(s);

diff --git a/src/core/unit.c b/src/core/unit.c
index 673af13c3eb3bf5a5e3bb3764d08908be8a82aac..7994f7038e222a6e494f45b7d9042839e71813ce 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2817,6 +2817,19 @@ int unit_add_mount_links(Unit *u) {
         return 0;
 }
 
+int unit_patch_working_directory(Unit *u, ExecContext *c) {
+        assert(u);
+        assert(c);
+
+        if (u->manager->running_as != MANAGER_USER)
+                return 0;
+
+        if (c->working_directory)
+                return 0;
+
+        return get_home_dir(&c->working_directory);
+}
+
 static const char* const unit_active_state_table[_UNIT_ACTIVE_STATE_MAX] = {
         [UNIT_ACTIVE] = "active",
         [UNIT_RELOADING] = "reloading",

diff --git a/src/core/unit.h b/src/core/unit.h
index 45849a4b126491bd6dacd06b1bea3cfbc475efbf..2483e4ea9d09a455c8e365870991a4d337cec992 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -537,6 +537,8 @@ void unit_ref_unset(UnitRef *ref);
 int unit_add_one_mount_link(Unit *u, Mount *m);
 int unit_add_mount_links(Unit *u);
 
+int unit_patch_working_directory(Unit *u, ExecContext *c);
+
 const char *unit_active_state_to_string(UnitActiveState i);
 UnitActiveState unit_active_state_from_string(const char *s);