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

diff --git a/debian/changelog b/debian/changelog
index 4ecac088289b05787decbee720b7175556b741b4..79cdf6ba64bd20608cb09306f70055e148561a10 100644 (file)
--- 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 10040aed75f80540d61eb63758989df5f0afff50..f32a921a097b06cd7f4176d11d952057a038c0b3 100644 (file)
--- 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 ee42e2b8c5bf1761a3949816e111b98e45a0dfa0..f3650d2756e62a51ba763fcedc2d029a56f2fc9b 100644 (file)
--- 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