From owner-svn-src-all@freebsd.org Wed Oct 24 23:31:34 2018 Return-Path: Delivered-To: svn-src-all@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 8B04F1073A4C; Wed, 24 Oct 2018 23:31:34 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3FF227F04D; Wed, 24 Oct 2018 23:31:34 +0000 (UTC) (envelope-from dteske@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 3AEA211D8; Wed, 24 Oct 2018 23:31:34 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9ONVYx1081263; Wed, 24 Oct 2018 23:31:34 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9ONVYIs081262; Wed, 24 Oct 2018 23:31:34 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201810242331.w9ONVYIs081262@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Wed, 24 Oct 2018 23:31:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r339699 - stable/9/sys/boot/forth X-SVN-Group: stable-9 X-SVN-Commit-Author: dteske X-SVN-Commit-Paths: stable/9/sys/boot/forth X-SVN-Commit-Revision: 339699 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2018 23:31:34 -0000 Author: dteske Date: Wed Oct 24 23:31:33 2018 New Revision: 339699 URL: https://svnweb.freebsd.org/changeset/base/339699 Log: MFC r339509: Fix loader.conf(5) "password" feature Restore the ability to prevent the user from interrupting the boot process without first entering the password stored in loader.conf(5). PR: kern/207069 Reported by: david@dcrosstech.com Sponsored by: Smule, Inc. Modified: stable/9/sys/boot/forth/check-password.4th Directory Properties: stable/9/ (props changed) Modified: stable/9/sys/boot/forth/check-password.4th ============================================================================== --- stable/9/sys/boot/forth/check-password.4th Wed Oct 24 23:21:12 2018 (r339698) +++ stable/9/sys/boot/forth/check-password.4th Wed Oct 24 23:31:33 2018 (r339699) @@ -154,6 +154,7 @@ variable readlen \ input length \ We should prevent the user from visiting the menu or dropping to the \ interactive loader(8) prompt, but still allow the machine to boot... + any_conf_read? if load_kernel load_modules then 0 autoboot \ Only reached if autoboot fails for any reason (including if/when