From nobody Sun Jan 07 19:31:24 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 4T7S3w47h1z55lvK; Sun, 7 Jan 2024 19:31:24 +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 4T7S3w3MC1z4hlt; Sun, 7 Jan 2024 19:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704655884; 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=FEUeScETgBuZTyTgjcElY8QgaKc8nxDZvl+anOusYYc=; b=bKOPlyJNfOcL7PcqX2T9OpDKVrsOpUqODutPPSNbY77+cfPm4F8Mi8dtnt2ZcOLr9PZqPp 34pfQ9Ay8yneu4wxKZy7MVLK/B4PEJDVcExNF3A0QBC6fmMC7CG5+J2SFd84GyExVZl10g 7PHdcFeR3BqvkGL04beRa72NhJDXbHSuVzyJVCpeJergWvcmGacM035mgVGJ/xWdkUJAt/ 56O5VSqx++EhVJZQRT02JdBKAvEmtXPPgP7bwCyW0k9aTxtgb9iFhytYMn8M4DEbppLG9t cB7pqEWDH6cHkY50mW6Zu6IBEY9edFmPf9x4oY+X6rocJzcUuft53RZV4flQfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704655884; 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=FEUeScETgBuZTyTgjcElY8QgaKc8nxDZvl+anOusYYc=; b=dGpesHv3wnhVhAo6K2qwakpa65dMxefYeMefSy87VO3iIU1RaagkxRTRPMdmt0SABC4rlz aMnDs9hQvZOJ+FT6yDbnmzvDPyNQaK5laME/GV5Wigk1hzxoQHxdPFykK2nbhrYKOmHz/M Ab+/2pARwpptEcCXzPq34r+wWk612NzMYOQV+eh5TScZq/wx9fvFxe8HG0bOdyyv4fJup1 TWhqLm5l+bkslKO8wufaLsFwZCYg5yo2bYH2VDQx32qBPCm82TDYbvigmgQPTjJwZnZ5Qc kF//k3gVge2kJtX0r24C0YDvggqZTXTgP1oUzM6dLfBbmYF+tTPjrYcPZSy5VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704655884; a=rsa-sha256; cv=none; b=mMh6q4ULwAedMowDZ5F22bduJoUf/YcW89XbgjT1L4rSxbg2eaOH4dR/yXJaghdtqeigLw e0xLQeSb3H1wvfKdZ2VKtDhat4prrQp6c4EpebBuq6FNLQpeJHKI6p4lHqcdV6FtK0Wy7g CLiw/CUmqsBXT1m7b3EWFE19xUxUpKvAeewlLYm7Eg4Pvxx8tvAxA1gbgXxd452ZV2OdHM fgp9+VDpWd6rxe4JEoORmBnXapcuxg7BPea/b+AwbUq1/MmTDjIm5iehdj0SCjwCZijsl1 hOY7g309Qz18FUqi2al1t8NgPgf3M+O2pNVP55HaFyk8REkA08iLiXyAo0wLRQ== 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 4T7S3w2PPgzcqx; Sun, 7 Jan 2024 19:31:24 +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 407JVOsl093809; Sun, 7 Jan 2024 19:31:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407JVOlw093806; Sun, 7 Jan 2024 19:31:24 GMT (envelope-from git) Date: Sun, 7 Jan 2024 19:31:24 GMT Message-Id: <202401071931.407JVOlw093806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 66be60537568 - stable/14 - bsdinstall: rename "Live CD" to "Live System" 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 66be60537568cb47df7beef8bb190f3d04461224 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=66be60537568cb47df7beef8bb190f3d04461224 commit 66be60537568cb47df7beef8bb190f3d04461224 Author: Pierre Pronchery AuthorDate: 2023-12-29 18:23:48 +0000 Commit: Ed Maste CommitDate: 2024-01-07 19:31:10 +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 (cherry picked from commit 19bb1886be4f366e922f0be359874683a243624a) --- 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