From 2092af4c5e076cd433d435f8c6a86a416c154b24 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Apr 16 2021 22:13:54 +0000
Subject: Apply patch autofs-5.1.6-use-bit-flag-for-force-unlink-mounts.patch


patch_name: autofs-5.1.6-use-bit-flag-for-force-unlink-mounts.patch
present_in_specfile: true

---

diff --git a/CHANGELOG b/CHANGELOG
index ad6db7e..2d138be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -86,6 +86,7 @@ xx/xx/2018 autofs-5.1.5
 - fix direct mount unlink_mount_tree() path.
 - fix unlink mounts umount order.
 - fix incorrect logical compare in unlink_mount_tree().
+- use bit flag for force unlink mounts.
 
 19/12/2017 autofs-5.1.4
 - fix spec file url.
diff --git a/daemon/automount.c b/daemon/automount.c
index 8ec4ac5..d72592e 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -2337,7 +2337,7 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'F':
-			do_force_unlink = 1;
+			do_force_unlink = UNLINK_AND_CONT;
 			break;
 
 		case '?':
diff --git a/include/automount.h b/include/automount.h
index b672471..d8b96bf 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -590,6 +590,8 @@ struct autofs_point {
 	struct list_head submounts;	/* List of child submounts */
 };
 
+#define UNLINK_AND_CONT		0x01
+
 /* Foreably unlink existing mounts at startup. */
 extern int do_force_unlink;