forked from pool/systemd
b8b836245b
- Add systemctl-options.patch: handle SYSTEMCTL_OPTIONS internaly (bnc#798620). - Update crypt-loop-file.patch to correctly detect crypto loop files (bnc#799514). - Add journalctl-remove-leftover-message.patch: remove debug message in systemctl. - Add job-avoid-recursion-when-cancelling.patch: prevent potential recursion when cancelling a service. - Add sysctl-parse-all-keys.patch: ensure sysctl file is fully parsed. - Add journal-fix-cutoff-max-date.patch: fix computation of cutoff max date for journal. - Add reword-rescue-mode-hints.patch: reword rescue prompt. - Add improve-overflow-checks.patch: improve time overflow checks. - Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour with symlinks. - Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure hostnamectl requires an argument when called with set-hostname option. - Add agetty-overrides-term.patch: pass correctly terminal type to agetty. - Add check-for-empty-strings-in-strto-conversions.patch: better check for empty strings in strto* conversions. - Add strv-cleanup-error-path-loops.patch: cleanup strv on error path. - Add cryptsetup-handle-plain.patch: correctly handle "plain" option in cryptsetup. - Add fstab-generator-improve-error-message.patch: improve error message in fstab-generator. - Add delta-accept-t-option.patch: accept -t option in OBS-URL: https://build.opensuse.org/request/show/149703 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=331
26 lines
1.0 KiB
Diff
26 lines
1.0 KiB
Diff
From f9ea108e7c3544c03822277a1112a48dc62f6ed4 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Mon, 24 Dec 2012 13:01:00 +0100
|
|
Subject: [PATCH] fstab-generator: properly detect bind mounts
|
|
|
|
This kinda undoes a83cbaccd03c3f28e47e9330f4a22ff65ce4b561 and
|
|
1d634e21b453f3c80d7c6c4bd90a6b84e42a3d2a but corrects the original code
|
|
to compare the mount type with "bind" rather than the mount options.
|
|
---
|
|
src/fstab-generator/fstab-generator.c | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
Index: systemd-195/src/fstab-generator/fstab-generator.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/fstab-generator/fstab-generator.c
|
|
+++ systemd-195/src/fstab-generator/fstab-generator.c
|
|
@@ -199,7 +199,7 @@ static bool mount_is_bind(struct mntent
|
|
|
|
return
|
|
hasmntopt(me, "bind") ||
|
|
- streq(me->mnt_opts, "bind");
|
|
+ streq(me->mnt_type, "bind");
|
|
}
|
|
|
|
static bool mount_is_network(struct mntent *me) {
|