From owner-dev-commits-src-all@freebsd.org Mon Apr 19 18:42:03 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8EADE5FB613; Mon, 19 Apr 2021 18:42:03 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPFzH3ZYdz4jmX; Mon, 19 Apr 2021 18:42:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6E183243B3; Mon, 19 Apr 2021 18:42:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13JIg3NZ059539; Mon, 19 Apr 2021 18:42:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13JIg3bg059538; Mon, 19 Apr 2021 18:42:03 GMT (envelope-from git) Date: Mon, 19 Apr 2021 18:42:03 GMT Message-Id: <202104191842.13JIg3bg059538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: d3f0c032fb8b - main - bsdinstall: restore time selection screen MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3f0c032fb8b2d2ee8d491fa95108a3790541662 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 18:42:03 -0000 The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=d3f0c032fb8b2d2ee8d491fa95108a3790541662 commit d3f0c032fb8b2d2ee8d491fa95108a3790541662 Author: Yuri Pankov AuthorDate: 2021-04-19 18:39:59 +0000 Commit: Yuri Pankov CommitDate: 2021-04-19 18:39:59 +0000 bsdinstall: restore time selection screen Apparently new dialog does not like the height of 2 for the timebox widget, use 0 (minimum size) instead. Do the same for calendar widget as it does not change the appearance and to prevent possible future surprises. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D29720 --- usr.sbin/bsdinstall/scripts/time | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/time b/usr.sbin/bsdinstall/scripts/time index 67e539b53658..cccd5999a035 100755 --- a/usr.sbin/bsdinstall/scripts/time +++ b/usr.sbin/bsdinstall/scripts/time @@ -42,7 +42,7 @@ DATE=$(dialog --backtitle 'FreeBSD Installer' \ --cancel-label 'Skip' \ --defaultno \ --date-format '%Y%m%d%H%M.%S' \ - --calendar '' 2 40 \ + --calendar '' 0 40 \ 2>&1 1>&3) && date $DATE exec 3>&- @@ -54,7 +54,7 @@ TIME=$(dialog --backtitle 'FreeBSD Installer' \ --cancel-label 'Skip' \ --defaultno \ --time-format '%H%M.%S' \ - --timebox '' 2 40 \ + --timebox '' 0 40 \ 2>&1 1>&3) && date $TIME exec 3>&-