From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 11 Oct 2011 18:17:40 +0000 (+0200)
Subject: Add ConditionPathIsDirectory to lib-init-rw.{,auto}mount
X-Git-Tag: 37-1~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=263797dc0b4849a2bdd16c8575165b78bb375c88;p=systemd

Add ConditionPathIsDirectory to lib-init-rw.{,auto}mount
---

diff --git a/debian/changelog b/debian/changelog
index 4ecac088..79cdf6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ systemd (36-2) unstable; urgency=low
 
   * Change the type of the debian-fixup service to oneshot.
     Closes: #642961
+  * Add ConditionPathIsDirectory to lib-init-rw.automount and
+    lib-init-rw.mount so we only activate the unit if the directory
+    exists.  Closes: #633059
 
  -- Tollef Fog Heen <tfheen@debian.org>  Wed, 28 Sep 2011 20:04:13 +0200
 
diff --git a/debian/lib-init-rw.automount b/debian/lib-init-rw.automount
index 10040aed..f32a921a 100644
--- a/debian/lib-init-rw.automount
+++ b/debian/lib-init-rw.automount
@@ -9,6 +9,7 @@
 Description=Debian early rw Automount Point
 DefaultDependencies=no
 Before=basic.target
+ConditionPathIsDirectory=/lib/init/rw
 
 [Automount]
 Where=/lib/init/rw
diff --git a/debian/lib-init-rw.mount b/debian/lib-init-rw.mount
index ee42e2b8..f3650d27 100644
--- a/debian/lib-init-rw.mount
+++ b/debian/lib-init-rw.mount
@@ -1,6 +1,7 @@
 [Unit]
 Description=Debian early rw mount
 DefaultDependencies=no
+ConditionPathIsDirectory=/lib/init/rw
 
 [Mount]
 What=tmpfs