svn commit: r349180 - stable/12/usr.sbin/jail

[Jamie Gritton]

Author: jamie
Date: Tue Jun 18 23:49:13 2019
New Revision: 349180
URL: https://svnweb.freebsd.org/changeset/base/349180

Log:
  Unmount filesystems on jail removal with "-f", to get around a situation
  where the jail root vnode reference is stopping the filesystem from
  unmounting, when the jail is removed by still exists in a dying state.
  
  PR:		238517
  Reported by:	matthias at harz.de

Modified:
  stable/12/usr.sbin/jail/command.c

Modified: stable/12/usr.sbin/jail/command.c
==============================================================================
--- stable/12/usr.sbin/jail/command.c	Tue Jun 18 22:00:38 2019	(r349179)
+++ stable/12/usr.sbin/jail/command.c	Tue Jun 18 23:49:13 2019	(r349180)
@@ -475,6 +475,7 @@ run_command(struct cfjail *j)
 		if (down) {
 			argv[4] = NULL;
 			argv[3] = argv[1];
+			argv[1] = "-ft";
 			argv[0] = "/sbin/umount";
 		} else {
 			if (argc == 4) {
@@ -488,9 +489,9 @@ run_command(struct cfjail *j)
 				argv[4] = argv[1];
 				argv[3] = argv[0];
 			}
+			argv[1] = "-t";
 			argv[0] = _PATH_MOUNT;
 		}
-		argv[1] = "-t";
 		break;
 
 	case IP_MOUNT_DEVFS: