From 032865a54801f4382f05a8e0d38a938a85f9ccf9 Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Tue, 3 Jul 2018 13:12:03 +0800 Subject: [PATCH] - fix patches changelog entries. --- autofs-5.1.4-fix-age-setting-at-startup.patch | 20 +++++++++---------- ...e-umount_ent-recognise-forced-umount.patch | 13 +++++++++++- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/autofs-5.1.4-fix-age-setting-at-startup.patch b/autofs-5.1.4-fix-age-setting-at-startup.patch index f71e986..46bb038 100644 --- a/autofs-5.1.4-fix-age-setting-at-startup.patch +++ b/autofs-5.1.4-fix-age-setting-at-startup.patch @@ -19,16 +19,6 @@ Signed-off-by: Ian Kent daemon/automount.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---- autofs-5.1.4.orig/CHANGELOG -+++ autofs-5.1.4/CHANGELOG -@@ -29,6 +29,7 @@ xx/xx/2018 autofs-5.1.5 - - change expire type naming to better reflect usage. - - use defines for expire type. - - make umount_ent() recognise forced umount. -+- fix age setting at startup. - - 19/12/2017 autofs-5.1.4 - - fix spec file url. --- autofs-5.1.4.orig/daemon/automount.c +++ autofs-5.1.4/daemon/automount.c @@ -2606,7 +2606,7 @@ int main(int argc, char *argv[]) @@ -40,3 +30,13 @@ Signed-off-by: Ian Kent master_read_master(master_list, age, 1); } } +--- autofs-5.1.4.orig/CHANGELOG ++++ autofs-5.1.4/CHANGELOG +@@ -29,6 +29,7 @@ xx/xx/2018 autofs-5.1.5 + - change expire type naming to better reflect usage. + - use defines for expire type. + - make umount_ent() recognise forced umount. ++- fix age setting at startup. + + 19/12/2017 autofs-5.1.4 + - fix spec file url. diff --git a/autofs-5.1.4-make-umount_ent-recognise-forced-umount.patch b/autofs-5.1.4-make-umount_ent-recognise-forced-umount.patch index 7613c6e..3f29645 100644 --- a/autofs-5.1.4-make-umount_ent-recognise-forced-umount.patch +++ b/autofs-5.1.4-make-umount_ent-recognise-forced-umount.patch @@ -10,8 +10,9 @@ has been requested to avoid the log noise. Signed-off-by: Ian Kent --- + CHANGELOG | 1 + lib/mounts.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) + 2 files changed, 10 insertions(+), 7 deletions(-) --- autofs-5.1.4.orig/lib/mounts.c +++ autofs-5.1.4/lib/mounts.c @@ -39,3 +40,13 @@ Signed-off-by: Ian Kent /* * Verify that we actually unmounted the thing. This is a * belt and suspenders approach to not eating user data. +--- autofs-5.1.4.orig/CHANGELOG ++++ autofs-5.1.4/CHANGELOG +@@ -28,6 +28,7 @@ xx/xx/2018 autofs-5.1.5 + - add-man page note about extra slashes in paths. + - change expire type naming to better reflect usage. + - use defines for expire type. ++- make umount_ent() recognise forced umount. + + 19/12/2017 autofs-5.1.4 + - fix spec file url.