From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 13 Aug 2013 08:21:16 +0000 (+0200)
Subject: gpt-auto-generator: Skip /home mounting if /home is not empty
X-Git-Tag: v207~150
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4b1b14a6a6acb1640596d5e9542829d32989d385;p=elogind.git

gpt-auto-generator: Skip /home mounting if /home is not empty
---

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 0c7635bfe..60fb19ee0 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -40,6 +40,7 @@
  *
  * - Properly handle cryptsetup partitions
  * - Define new partition type for encrypted swap
+ * - Make /home automount rather than mount
  *
  */
 
@@ -201,6 +202,9 @@ static int add_home(const char *path, const char *fstype) {
         _cleanup_free_ char *unit = NULL, *lnk = NULL;
         _cleanup_fclose_ FILE *f = NULL;
 
+        if (dir_is_empty("/home") <= 0)
+                return 0;
+
         log_debug("Adding home: %s %s", path, fstype);
 
         unit = strappend(arg_dest, "/home.mount");