From owner-svn-src-stable-12@freebsd.org Tue Jun 18 23:49:14 2019 Return-Path: Delivered-To: svn-src-stable-12@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A69B415CC1A9; Tue, 18 Jun 2019 23:49:14 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C3016C209; Tue, 18 Jun 2019 23:49:14 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2436D1C55E; Tue, 18 Jun 2019 23:49:14 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5INnEVC088464; Tue, 18 Jun 2019 23:49:14 GMT (envelope-from jamie@FreeBSD.org) Received: (from jamie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5INnE5X088463; Tue, 18 Jun 2019 23:49:14 GMT (envelope-from jamie@FreeBSD.org) Message-Id: <201906182349.x5INnE5X088463@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jamie set sender to jamie@FreeBSD.org using -f From: Jamie Gritton Date: Tue, 18 Jun 2019 23:49:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r349180 - stable/12/usr.sbin/jail X-SVN-Group: stable-12 X-SVN-Commit-Author: jamie X-SVN-Commit-Paths: stable/12/usr.sbin/jail X-SVN-Commit-Revision: 349180 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4C3016C209 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2019 23:49:14 -0000 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: