Revert "Add systemd depends on new mount."

This reverts commit 61af16b53ef2e288b9765c2046a15b4e823a2609.

We don't want a dependency on new mount for now as this would entangle
util-linux and systemd when transitioning to unstable. As systemd seems
to work fine with the old mount, we simply add back the changes to the
documentation using the comment= syntax. This also re-opens #754411.

diff --git a/debian/changelog b/debian/changelog
index 334eb332b80633c4f935ca817e47c372f13c6f44..1b35825612c0af8e1bb2858adc0d138f439cbc80 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ systemd (214-2) UNRELEASED; urgency=medium
 
   * Drop our Debian-specific run-user.mount unit as upstream now creates a
     per-user tmpfs via logind.
+  * Don't rely on new mount from experimental for now and re-add the patch
+    which updates the documentation accordingly.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 26 Aug 2014 12:09:10 +0200
 

diff --git a/debian/control b/debian/control
index 29bf88c12b8f6cd3af474b280edfdd3bf1ecde5b..fd3521807514c4ca28e31d1149d5ea4373a25e40 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,6 @@ Pre-Depends: ${shlibs:Pre-Depends},
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libsystemd0 (= ${binary:Version}),
-         mount (>= 2.23),
          util-linux (>= 2.19.1-2),
          initscripts (>= 2.88dsf-53.2),
          sysv-rc,

diff --git a/debian/patches/Use-comment-systemd.-syntax-in-systemd.mount-man-pag.patch b/debian/patches/Use-comment-systemd.-syntax-in-systemd.mount-man-pag.patch
new file mode 100644 (file)
index 0000000..9380cae
--- /dev/null
+++ b/debian/patches/Use-comment-systemd.-syntax-in-systemd.mount-man-pag.patch
@@ -0,0 +1,33 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Sat, 19 Jan 2013 15:33:44 +0100
+Subject: Use comment=systemd.* syntax in systemd.mount man page
+
+The mount/util-linux version in wheezy is not recent enough to support
+the new x-systemd* syntax. It requires util-linux 2.21 or newer with the
+--enable-new-mount option enabled.
+
+Once we have such a version in Debian, this commit should be reverted
+again.
+---
+ man/systemd.mount.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
+index 657cf11..bfc3ac8 100644
+--- a/man/systemd.mount.xml
++++ b/man/systemd.mount.xml
+@@ -148,12 +148,12 @@
+                 <filename>local-fs.target</filename> or
+                 <filename>remote-fs.target</filename>, depending
+                 whether the file system is local or remote. If
+-                <option>x-systemd.automount</option> is set, an
++                <option>comment=systemd.automount</option> is set, an
+                 automount unit will be created for the file
+                 system. See
+                 <citerefentry><refentrytitle>systemd.automount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                 for details. If
+-                <option>x-systemd.device-timeout=</option> is
++                <option>comment=systemd.device-timeout=</option> is
+                 specified, it may be used to configure how long systemd
+                 should wait for a device to show up before giving up
+                 on an entry from

diff --git a/debian/patches/series b/debian/patches/series
index 9cb192627e740430197b70df3ef268e2a1b72ae7..f8113988d03fe8156eda168efc10348f052e5326 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -86,6 +86,7 @@ udev-hwdb-Store-binary-database-in-libdir-not-in-etc.patch
 Make-99-systemd.rules-check-for-run-systemd-systemd-.patch
 Make-net.ifnames-opt-in-instead-of-opt-out.patch
 Use-different-default-paths-for-various-binaries.patch
+Use-comment-systemd.-syntax-in-systemd.mount-man-pag.patch
 Avoid-reloading-services-when-shutting-down.patch
 Avoid-reload-and-re-start-requests-during-early-boot.patch
 Order-remote-fs.target-after-local-fs.target.patch