|
 |
1b50e3 |
autofs-5.1.6 - use bit flag for force unlink mounts
|
|
|
1b50e3 |
|
|
|
1b50e3 |
From: Ian Kent <raven@themaw.net>
|
|
|
1b50e3 |
|
|
|
1b50e3 |
Change global varaiable do_force_unlink to be a bit flag.
|
|
|
1b50e3 |
|
|
|
1b50e3 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
1b50e3 |
---
|
|
|
1b50e3 |
CHANGELOG | 1 +
|
|
|
1b50e3 |
daemon/automount.c | 2 +-
|
|
|
1b50e3 |
include/automount.h | 2 ++
|
|
|
1b50e3 |
3 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
1b50e3 |
|
|
|
1b50e3 |
--- autofs-5.1.4.orig/CHANGELOG
|
|
|
1b50e3 |
+++ autofs-5.1.4/CHANGELOG
|
|
|
1b50e3 |
@@ -86,6 +86,7 @@ xx/xx/2018 autofs-5.1.5
|
|
|
1b50e3 |
- fix direct mount unlink_mount_tree() path.
|
|
|
1b50e3 |
- fix unlink mounts umount order.
|
|
|
1b50e3 |
- fix incorrect logical compare in unlink_mount_tree().
|
|
|
1b50e3 |
+- use bit flag for force unlink mounts.
|
|
|
1b50e3 |
|
|
|
1b50e3 |
19/12/2017 autofs-5.1.4
|
|
|
1b50e3 |
- fix spec file url.
|
|
|
1b50e3 |
--- autofs-5.1.4.orig/daemon/automount.c
|
|
|
1b50e3 |
+++ autofs-5.1.4/daemon/automount.c
|
|
|
1b50e3 |
@@ -2337,7 +2337,7 @@ int main(int argc, char *argv[])
|
|
|
1b50e3 |
break;
|
|
|
1b50e3 |
|
|
|
1b50e3 |
case 'F':
|
|
|
1b50e3 |
- do_force_unlink = 1;
|
|
|
1b50e3 |
+ do_force_unlink = UNLINK_AND_CONT;
|
|
|
1b50e3 |
break;
|
|
|
1b50e3 |
|
|
|
1b50e3 |
case '?':
|
|
|
1b50e3 |
--- autofs-5.1.4.orig/include/automount.h
|
|
|
1b50e3 |
+++ autofs-5.1.4/include/automount.h
|
|
|
1b50e3 |
@@ -590,6 +590,8 @@ struct autofs_point {
|
|
|
1b50e3 |
struct list_head submounts; /* List of child submounts */
|
|
|
1b50e3 |
};
|
|
|
1b50e3 |
|
|
|
1b50e3 |
+#define UNLINK_AND_CONT 0x01
|
|
|
1b50e3 |
+
|
|
|
1b50e3 |
/* Foreably unlink existing mounts at startup. */
|
|
|
1b50e3 |
extern int do_force_unlink;
|
|
|
1b50e3 |
|