From nobody Sun Feb 4 11:59:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TSSjJ30ZQz59dsw; Sun, 4 Feb 2024 11:59:16 +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 4TSSjJ0sdgz4NlC; Sun, 4 Feb 2024 11:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707047956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4eWPFcxzvs17QQjVfyHMEsC6r11jsgK43gGcViKT43Y=; b=Y2OxQQuK/eMslrOv2AZPuv7t+FQJolAlZruKT7lfZ+tDeb98XLAdiykixjLOcHoxOiPKKI 3+eHHaKz9AIfmfto6dCFmvbWLV+3mpCn0ep+ZEa+0hJj+lp0zV7iIKUoUx8oqg0uLmovtv KkLZRVEVkdxrW9jEI6XcwySfQ/7XAgi1uAfM2dZnY/loWCBpRCq2dX/+DGEy6+FG+pJzcQ 8GQFQBVqnv/foUCCC8eucYttU5fp91XMazxgc75xTjbJIKfMFdl+lOPqNH9lFXa2Ls7TWV ldZbs1VY/JHzY0R5NuNNgty/zVT1JJa1v9xUBwsAAwidCJ+BzeXgl+f5bQ0+sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707047956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4eWPFcxzvs17QQjVfyHMEsC6r11jsgK43gGcViKT43Y=; b=w5sGlG+/rLcVAxKK28n1jcLvoefiNAdjfmVbIOLcNZeeQGxkeB7mXwPmmIV/CpFAeFyMWK cBKmqSAEHMC/hCZCt0DdZUwTiFtFBNvaDJHjfQOlDZm0xuabwBVTzxfI8JmVSqqj/2bU/5 9EtKVqSXfGMRKTDYMlhEWASrlVhys3mJOMTlUa3p2+gfE6TmvHPgxcMiBpyC9N5pbh/INn jsPnjDcVyhgL07n9iKzEdqgZc9Y1ZwfktJeG9J24eappPEg7NBBBPRDRoNyGLXV0SuyHsT kccldnNqa06CWlxPOQGSzwu++wRgY/GDrI/qsFs0hSUUJ3yPv4LTWjZA45wR8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707047956; a=rsa-sha256; cv=none; b=lZ+o/tf36fSMZxRjRP7PeuMsRjBHelCGm4V3465p4oWV9xptFbQ2dTaup8P5Msryso13Iz kwuxgsGR9exVXNBkPQCNl8JgvNdg+VOVK4PajzWfZJvgegYSZEh1vv4wFta9j7zFqEkODg xyOV8ng16VsqBgZrxctEeejV76hkFao+yM01Cprsn9bNffi1QqxVnfMXNfT3F9luAY8k4g x2NLtVKCqB8v4qIYn7FH7eNAXRS+dsCxakn6UIqLfL4bFIGxqNvdpWcaFonoTLsFh8DcD4 usqx4d03cysaA+iry2SAslAmfb/I7Gyq9lpCarnfb8ehNbQ0X75mysge+bNi3Q== 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 4TSSjH72Y1zwjP; Sun, 4 Feb 2024 11:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 414BxFRR075483; Sun, 4 Feb 2024 11:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 414BxFBX075480; Sun, 4 Feb 2024 11:59:15 GMT (envelope-from git) Date: Sun, 4 Feb 2024 11:59:15 GMT Message-Id: <202402041159.414BxFBX075480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: cd724c25928d - main - bsdinstall: complete whitelabeling the installer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd724c25928d0d30761d118690b4ac75ca931b63 Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=cd724c25928d0d30761d118690b4ac75ca931b63 commit cd724c25928d0d30761d118690b4ac75ca931b63 Author: Mariusz Zaborski AuthorDate: 2024-02-04 11:59:07 +0000 Commit: Mariusz Zaborski CommitDate: 2024-02-04 12:01:08 +0000 bsdinstall: complete whitelabeling the installer The commit 147585b4893bc38698aaa971af336b241477eac3 introduces whitlabeling. This commit addresses couple more places where the os name was missed. Reviewed by: imp, asiciliano, brd Differential Revision: https://reviews.freebsd.org/D43638 --- usr.sbin/bsdinstall/partedit/part_wizard.c | 6 +++--- usr.sbin/bsdinstall/partedit/partedit.c | 4 ++-- usr.sbin/bsdinstall/startbsdinstall | 15 +++++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c index a3c5cb43ec51..44d9a08b0c78 100644 --- a/usr.sbin/bsdinstall/partedit/part_wizard.c +++ b/usr.sbin/bsdinstall/partedit/part_wizard.c @@ -66,7 +66,7 @@ startwizard: if (error != 0) return (1); - bsddialog_backtitle(&conf, "FreeBSD Installer"); + bsddialog_backtitle(&conf, OSNAME " Installer"); disk = boot_disk_select(&mesh); if (disk == NULL) { geom_deletetree(&mesh); @@ -74,7 +74,7 @@ startwizard: } bsddialog_clear(0); - bsddialog_backtitle(&conf, "FreeBSD Installer"); + bsddialog_backtitle(&conf, OSNAME " Installer"); schemeroot = wizard_partition(&mesh, disk); free(disk); geom_deletetree(&mesh); @@ -82,7 +82,7 @@ startwizard: return (1); bsddialog_clear(0); - bsddialog_backtitle(&conf, "FreeBSD Installer"); + bsddialog_backtitle(&conf, OSNAME " Installer"); error = geom_gettree(&mesh); if (error != 0) { free(schemeroot); diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index 74606a2ef8f3..148cb74edc75 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -125,7 +125,7 @@ main(int argc, const char **argv) while (prompt != NULL) { bsddialog_clear(0); if (!sade_mode) - bsddialog_backtitle(&conf, "FreeBSD Installer"); + bsddialog_backtitle(&conf, OSNAME " Installer"); error = geom_gettree(&mesh); if (error == 0) @@ -137,7 +137,7 @@ main(int argc, const char **argv) "installation menu.", 0, 0); break; } - + get_mount_points(items, nitems); if (i >= nitems) diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall index 63239c969ac6..ab78c2941256 100644 --- a/usr.sbin/bsdinstall/startbsdinstall +++ b/usr.sbin/bsdinstall/startbsdinstall @@ -1,5 +1,8 @@ #!/bin/sh +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 + : ${BSDDIALOG_OK=0} : ${BSDDIALOG_CANCEL=1} : ${BSDDIALOG_HELP=2} @@ -27,7 +30,7 @@ if [ $? -eq 0 ]; then else # Serial or other console echo - echo "Welcome to FreeBSD!" + echo "Welcome to ${OSNAME}!" echo echo "Please choose the appropriate terminal type for your system." echo "Common console types are:" @@ -46,18 +49,18 @@ resizewin -z if [ -f /etc/installerconfig ]; then if [ "$1" != "primary" ]; then - bsddialog --backtitle "FreeBSD Installer" --title "Installing" --msgbox "FreeBSD is being installed from a script; please use the primary console." 0 0 + bsddialog --backtitle "${OSNAME} Installer" --title "Installing" --msgbox "${OSNAME} is being installed from a script; please use the primary console." 0 0 . "$0" elif bsdinstall script /etc/installerconfig; then - bsddialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10 + bsddialog --backtitle "${OSNAME} Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of ${OSNAME} complete! Rebooting in 10 seconds" 10 30 10 reboot else - bsddialog --backtitle "FreeBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0 + bsddialog --backtitle "${OSNAME} Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0 fi exit fi -bsddialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live System" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live system?" 0 0 +bsddialog --backtitle "${OSNAME} Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live System" --yesno "Welcome to ${OSNAME}! Would you like to begin an installation or use the live system?" 0 0 case $? in $BSDDIALOG_OK) # Install @@ -70,7 +73,7 @@ $BSDDIALOG_OK) # Install trap true SIGINT # Ignore cntrl-C here bsdinstall if [ $? -eq 0 ]; then - bsddialog --backtitle "FreeBSD Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live System" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 + bsddialog --backtitle "${OSNAME} Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live System" --yesno "Installation of ${OSNAME} complete! Would you like to reboot into the installed system now?" 0 0 case $? in $BSDDIALOG_OK) # Reboot