From nobody Fri Dec 29 20:25:43 2023 X-Original-To: dev-commits-src-main@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 4T1xhm0Lqrz558bN; Fri, 29 Dec 2023 20:25:44 +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 4T1xhl6sV7z3Smc; Fri, 29 Dec 2023 20:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703881544; 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=h/jFyPLrX+1cYTkzrnUgkEJ6dcudOmRDCZEM18u9KcI=; b=TY1L+11VZDfTOetlgxdRDo+ZCseCUtCce1ztkGNu/d/jvh8bWFbH4FQP8PipHR5iok5Fcr tG7dg8FsLrNaHHnwtJSm00C1KLuLe3a0vauYInyk3HBATWq0v1WzA1Khk8GXcUbVpzaEwm SSEDbhI9ndnb7hwBL5Bk1TWGfqFA9lwHTntXCceRxd2XnkvPES6tJkbtHDFI0djKOItD2d fFs7uzeixSx8q2qyg9j9QF27WONScyZ95XhCnuzmGiGLfqSu2ogFXhShkY446CZfiG0a+C dapZk/aynw3WID7S79ghJjgbwnX8gIm1+Yx6DJ5mcA9c77Ts5UgP+SD2aoD+hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703881544; a=rsa-sha256; cv=none; b=BAtyAz0LPsHmL8mWH1r6Im1E8VyBkZ0RJSVmJU3GNP/2zfrORbppB2hJYCKME7yW4ewDYF G/CsBzt1YkuTakrBeAZpL+AxKRTMV8XNX1lxEG6J8RHc2IGYttUp5bdrytO1dknLDONmfa o3RIpwaQmbZCG98ppCPAY+7EEtokv0Jo2CP5v7uNIPtYo0z9bSoY8Upb6fYHU0lOazT1Nu MA+RZuc+SeToWNHZlFTLorQ8uNAbmYcY98MDEhnp4Zd7arRVCaFCArrIypD7ktZtvd1ql9 02O9SJK531pL5xnFu/IfyyDPRPIzBS70nYl9MNyOrYwiM5hSYFQYiS6565ubgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703881544; 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=h/jFyPLrX+1cYTkzrnUgkEJ6dcudOmRDCZEM18u9KcI=; b=Wzo43Tq63f9rzmJINKi/nXKC+/nR1XrzbLPPAEFxTs9BsABdeSUcrbEhNmIhONBwRMa67b 41inrNxiQnv73ygMzIHb+TfNWlf6EVtW6U+utOLekF5OGVCDyzRzkSmrYRZ/6z/pSFsc0K gETvuTalWQHoMNpeuIAK9AOq795zmlySMN/vSHgqUuWqdUh9GB9Lj6Ca64EYZyfwFqwO9D UHDfgM62MCofBI4UuB/DMdOYFk1bhxra7N+OtauzvjQ0EFA2/iOamycI8U6GNznDbT8uP0 j0Oo9MRQvP2yOy6gIhLHS8kiI/zKZGL6iJ1lMe/NfwibnocUrA18tYF1sB69Jw== 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 4T1xhl5wHJz5rP; Fri, 29 Dec 2023 20:25:43 +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 3BTKPhbE005906; Fri, 29 Dec 2023 20:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTKPh36005903; Fri, 29 Dec 2023 20:25:43 GMT (envelope-from git) Date: Fri, 29 Dec 2023 20:25:43 GMT Message-Id: <202312292025.3BTKPh36005903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 19bb1886be4f - main - bsdinstall: rename "Live CD" to "Live System" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19bb1886be4f366e922f0be359874683a243624a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=19bb1886be4f366e922f0be359874683a243624a commit 19bb1886be4f366e922f0be359874683a243624a Author: Pierre Pronchery AuthorDate: 2023-12-29 18:23:48 +0000 Commit: Ed Maste CommitDate: 2023-12-29 20:24:25 +0000 bsdinstall: rename "Live CD" to "Live System" This uses more generic wording in the FreeBSD installer, when offering the user to use the system booted without running the installer. The updated wording is also reflected in freebsd-version(1). Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D43233 --- bin/freebsd-version/freebsd-version.1 | 2 +- usr.sbin/bsdinstall/startbsdinstall | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/freebsd-version/freebsd-version.1 b/bin/freebsd-version/freebsd-version.1 index b9f0861f890a..82ea9c707d69 100644 --- a/bin/freebsd-version/freebsd-version.1 +++ b/bin/freebsd-version/freebsd-version.1 @@ -111,7 +111,7 @@ To determine the version of the currently running userland: /bin/freebsd-version -u .Ed .Pp -To inspect a system being repaired using a live CD: +To inspect a system being repaired using a live system: .Bd -literal -offset indent mount -rt ufs /dev/ada0p2 /mnt env ROOT=/mnt /mnt/bin/freebsd-version -ku diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall index af0fd56e73b3..63239c969ac6 100644 --- a/usr.sbin/bsdinstall/startbsdinstall +++ b/usr.sbin/bsdinstall/startbsdinstall @@ -57,7 +57,7 @@ if [ -f /etc/installerconfig ]; then exit fi -bsddialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 +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 case $? in $BSDDIALOG_OK) # Install @@ -70,7 +70,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 CD" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 + 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 case $? in $BSDDIALOG_OK) # Reboot @@ -90,7 +90,7 @@ $BSDDIALOG_OK) # Install sleep 1 done ;; - $BSDDIALOG_CANCEL) # Live CD + $BSDDIALOG_CANCEL) # Live System exit 0 ;; esac @@ -98,7 +98,7 @@ $BSDDIALOG_OK) # Install . "$0" fi ;; -$BSDDIALOG_CANCEL) # Live CD +$BSDDIALOG_CANCEL) # Live System exit 0 ;; $BSDDIALOG_EXTRA) # Shell