Commit 8fb0c725 authored by Martin Pitt's avatar Martin Pitt
Browse files

Drop Use-comment-systemd.-syntax-in-systemd.mount-man-pag.patch

Our util-linux is now recent enough. Bump dependency to >= 2.21.
parent d1a916e7
......@@ -9,6 +9,8 @@ systemd (215-6) UNRELEASED; urgency=medium
for now (that will happen once we see results from all the architectures).
* Drop our Check-for-kmod-binary.patch as the upstream patch
units-conditionalize-static-device-node-logic-on-CAP.patch supersedes it.
* Drop Use-comment-systemd.-syntax-in-systemd.mount-man-pag.patch, as
our util-linux is now recent enough. Bump dependency to >= 2.21.
-- Martin Pitt <mpitt@debian.org> Sun, 12 Oct 2014 17:29:00 +0200
......
......@@ -51,7 +51,7 @@ Pre-Depends: ${shlibs:Pre-Depends},
Depends: ${shlibs:Depends},
${misc:Depends},
libsystemd0 (= ${binary:Version}),
util-linux (>= 2.19.1-2),
util-linux (>= 2.21),
initscripts (>= 2.88dsf-53.2),
sysv-rc,
udev,
......
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 f06c18e..bea0bea 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -153,7 +153,7 @@
<variablelist class='fstab-options'>
<varlistentry>
- <term><option>x-systemd.automount</option></term>
+ <term><option>comment=systemd.automount</option></term>
<listitem><para>An automount unit will be created
for the file system. See
@@ -162,7 +162,7 @@
</varlistentry>
<varlistentry>
- <term><option>x-systemd.device-timeout=</option></term>
+ <term><option>comment=systemd.device-timeout=</option></term>
<listitem><para>Configure how long systemd should
wait for a device to show up before giving up on
......@@ -130,7 +130,6 @@ Revert-udev-network-device-renaming-immediately-give.patch
udev-hwdb-Store-binary-database-in-libdir-not-in-etc.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