Fix automount aborted when use -M option

This commit is contained in:
si-gui 2020-09-18 10:54:19 +08:00
parent d9ada252f0
commit 161908d0ab
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From ccaed629b1eff17aa5560c098c7ccae305565ba4 Mon Sep 17 00:00:00 2001
From: si-gui <245140120@qq.com>
Date: Fri, 18 Sep 2020 10:47:58 +0800
Subject: [PATCH] fix automount aborted when use -M
Signed-off-by: si-gui <245140120@qq.com>
---
daemon/automount.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemon/automount.c b/daemon/automount.c
index 05ec8a6..f0d1f08 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -2156,7 +2156,7 @@ int main(int argc, char *argv[])
time_t timeout;
time_t age = monotonic_time(NULL);
struct rlimit rlim;
- const char *options = "+hp:t:vmdD:fVrO:l:n:CFM";
+ const char *options = "+hp:t:vmdD:fVrO:l:n:CFM:";
static const struct option long_options[] = {
{"help", 0, 0, 'h'},
{"pid-file", 1, 0, 'p'},
--
2.23.0

View File

@ -1,6 +1,6 @@
Name: autofs
Version: 5.1.4
Release: 24
Release: 25
Epoch: 1
Summary: A tool for automatically mounting and unmounting filesystems
License: GPLv2+
@ -41,6 +41,7 @@ Patch0032: 0031-autofs-5.1.4-fix-age-setting-at-startup.patch
Patch0033: 0032-autofs-5.1.4-fix-update_negative_cache-map-source-usage.patch
Patch0034: 0033-autofs-5.1.4-fix-program-usage-message.patch
Patch0035: 0034-autofs-5.1.4-fix-use-after-free-in-parse_ldap_config.patch
Patch0036: 0035-fix-automount-aborted-when-use-M.patch
Requires: bash coreutils sed gawk grep module-init-tools procps
Requires(post): systemd-sysv systemd-units
@ -120,6 +121,9 @@ install -m 600 samples/autofs_ldap_auth.conf $RPM_BUILD_ROOT/etc/autofs_ldap_aut
%{_mandir}/*/*
%changelog
* Fri Sep 18 2020 Guoshuai Sun <sunguoshuai@huawei.com> - 1:5.1.4-25
- Fix automount aborted when use -M option
* Thu Sep 17 2020 lingsheng <lingsheng@huawei.com> - 1:5.1.4-24
- Build without hesiod