Commit 61af16b5 authored by Jon Severinsson's avatar Jon Severinsson Committed by Sjoerd Simons
Browse files

Add systemd depends on new mount.

Also drop now-obsolete manpage patch.
parent abd357af
......@@ -25,6 +25,7 @@ systemd (214-1) UNRELEASED; urgency=medium
- Map rcS.d init script dependencies to their systemd equivalent.
- Special-case some dependencies for sysv init scripts for better
backwards compatibility. (Closes: #726027, #738965).
* Add systemd depends on new mount. (Closes: #754411)
[ Sjoerd Simons ]
* debian/patches/shared-include-stdbool.h-in-mkdir.h.patch
......
......@@ -50,6 +50,7 @@ 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,
......
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
......@@ -85,7 +85,6 @@ 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment