From 6bee11e5bb1ba1a66c567af85e430a46448f5e17 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 4 Sep 2014 16:58:14 +0200 Subject: [PATCH] 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. --- debian/changelog | 2 ++ debian/control | 1 - ...emd.-syntax-in-systemd.mount-man-pag.patch | 33 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 debian/patches/Use-comment-systemd.-syntax-in-systemd.mount-man-pag.patch diff --git a/debian/changelog b/debian/changelog index 334eb332b..1b3582561 100644 --- 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 Tue, 26 Aug 2014 12:09:10 +0200 diff --git a/debian/control b/debian/control index 29bf88c12..fd3521807 100644 --- 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 index 000000000..9380cae6c --- /dev/null +++ b/debian/patches/Use-comment-systemd.-syntax-in-systemd.mount-man-pag.patch @@ -0,0 +1,33 @@ +From: Michael Biebl +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 @@ + local-fs.target or + remote-fs.target, depending + whether the file system is local or remote. If +- is set, an ++ is set, an + automount unit will be created for the file + system. See + systemd.automount5 + for details. If +- is ++ 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 9cb192627..f8113988d 100644 --- 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 -- 2.39.5