From nobody Tue Apr 11 14:14:06 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 4Pwnrz4r0Nz44wcV; Tue, 11 Apr 2023 14:14:11 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pwnry6klYz4QsT; Tue, 11 Apr 2023 14:14:10 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681222450; 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: in-reply-to:in-reply-to:references:references; bh=C6qrujhukX1YY5ZaqaF4CvCqZ5E+z9z+F86o5ICBhgo=; b=xxFC79VsIE/UMkPsSZGM+m6+sBuxK3mzCjyprdPsePvwrW/A9sSVEd4GnndpVLnsfAjX63 Y/pqnJhxhzb8qDe8owfmNLWzuakwVZXRkGvbwgJ5FCHdTa8F4u8OKRgsXR9TZ8uCb+tqhJ /xKZs27/0BFj6dg92pXAP3IbMV1re6hr9opHNdL4BaHbJ+pO8HWitnyYS06sZtWeAz2Hue F99gWheWrfW3r1aGbRwBUh6v+niM1euL8AjBn1AYfUyu3QCZgdOJ7uovs9aUMkL7hQkq2L sDjQ5TYRXT180YfR4nXdlVP/FeciEseHnVCxXCU4icFuAD5x5doQ+MNWhsVZpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681222450; 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: in-reply-to:in-reply-to:references:references; bh=C6qrujhukX1YY5ZaqaF4CvCqZ5E+z9z+F86o5ICBhgo=; b=jxW10W111LJVL/F81Dz4nFaG19PKW4xj8YKzpvBHtUeRKyjOI4LvopFLX91pn6x4iiJAzq x4fsSC1HODLt7iLI0LSiIJn5PPdmWU3ve0EnSds2ucbGgQ8dxW4cmAObIq3xIb8Tdir9kR c1lVPAA+9ubtt+BbScvY1fvHNA3meHoiFX9Uj94qc/B6gYdjaidNmOfDGEP4A2mlPUMTyQ hGJJhKVQXjEqfzZPvL5cqoD+/EoNYkiuXLYDhSyHkej28ci8syI8dRoeja2iPuUb2TSaa4 I1siDIFpyF0eiZiJIu2/YsLONYRJpCkr3GcxbHkqd8JdSJO3KAPeDz257Y97WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681222450; a=rsa-sha256; cv=none; b=q2OB4qVhHcEFiRdc9xoRBLo8vi3g0tsiyvRbQ3DV/Axr6eJV7VoPG3pea+YFx5E0LMbR8h cWNjVzcJ9QHR24Vi0droaABN4Is0qu8A8fFXl1vAbDgr25nXEfaDaDvWappt0GhQt2ypK0 WucsM254BBdKUy0mShFrpXEKfySpaXvIqHs899wPN8PN83N6/uXDaHotoDo2lk+hwE/m53 2nBt3o2yUuONBvDY/eqiuJCrEKNp3rq7fn/HYYVnjntRyzJxEY23CN6b946hLf1Z0XTb60 spefM3jp6hb6VYEIDnxciZCT03uQ4JNEzCIPXo/NHHu4iK6oS4EzEs2ALl5sfg== Received: from [192.168.1.25] (net-93-148-110-254.cust.vodafonedsl.it [93.148.110.254]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: asiciliano) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pwnry0jyDz12Jm; Tue, 11 Apr 2023 14:14:09 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) Message-ID: <6cd86574-0aed-a9ac-150b-598b01924cfd@FreeBSD.org> Date: Tue, 11 Apr 2023 16:14:06 +0200 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: git: d577d6178bde - main - bsdinstall release: Move code to a new startbsdinstall wrapper Content-Language: en-US To: Jessica Clarke , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202210031609.293G9hiu022582@gitrepo.freebsd.org> From: "Alfonso S. Siciliano" In-Reply-To: <202210031609.293G9hiu022582@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 03/10/2022 18:09, Jessica Clarke wrote: > The branch main has been updated by jrtc27: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d577d6178bdeff86dbff0b954659ac5e23c17b2a > > commit d577d6178bdeff86dbff0b954659ac5e23c17b2a > Author: Jessica Clarke > AuthorDate: 2022-10-03 16:09:16 +0000 > Commit: Jessica Clarke > CommitDate: 2022-10-03 16:09:16 +0000 > > bsdinstall release: Move code to a new startbsdinstall wrapper > > This separates out the install media-specific environment (creating > bsdinstall_etc) from actually running the installer on a given console. > This will be used by a future change to start the installer on multiple > consoles. > > Reviewed by: brooks, gjb > Differential Revision: https://reviews.freebsd.org/D36803 > --- > release/rc.local | 96 +------------------------------ > tools/build/mk/OptionalObsoleteFiles.inc | 1 + > usr.sbin/bsdinstall/Makefile | 3 + > usr.sbin/bsdinstall/startbsdinstall | 97 ++++++++++++++++++++++++++++++++ > 4 files changed, 102 insertions(+), 95 deletions(-) > > diff --git a/release/rc.local b/release/rc.local > index 9adaea468ae7..943c175ddd52 100755 > --- a/release/rc.local > +++ b/release/rc.local > @@ -1,101 +1,7 @@ > #!/bin/sh > # $FreeBSD$ > > -: ${BSDDIALOG_OK=0} > -: ${BSDDIALOG_CANCEL=1} > -: ${BSDDIALOG_HELP=2} > -: ${BSDDIALOG_EXTRA=3} > -: ${BSDDIALOG_ESC=5} > -: ${BSDDIALOG_ERROR=255} > - > # resolv.conf from DHCP ends up in here, so make sure the directory exists > mkdir /tmp/bsdinstall_etc > > -kbdcontrol -d >/dev/null 2>&1 > -if [ $? -eq 0 ]; then > - # Syscons: use xterm, start interesting things on other VTYs > - TERM=xterm > - > - # Don't send ESC on function-key 62/63 (left/right command key) > - kbdcontrol -f 62 '' > /dev/null 2>&1 > - kbdcontrol -f 63 '' > /dev/null 2>&1 > - > - if [ -z "$EXTERNAL_VTY_STARTED" ]; then > - # Init will clean these processes up if/when the system > - # goes multiuser > - touch /tmp/bsdinstall_log > - tail -f /tmp/bsdinstall_log > /dev/ttyv2 & > - /usr/libexec/getty autologin ttyv3 & > - EXTERNAL_VTY_STARTED=1 > - fi > -else > - # Serial or other console > - echo > - echo "Welcome to FreeBSD!" > - echo > - echo "Please choose the appropriate terminal type for your system." > - echo "Common console types are:" > - echo " ansi Standard ANSI terminal" > - echo " vt100 VT100 or compatible terminal" > - echo " xterm xterm terminal emulator (or compatible)" > - echo > - echo -n "Console type [vt100]: " > - read TERM > - TERM=${TERM:-vt100} > -fi > -export TERM > - > -# Query terminal size; useful for serial lines. > -resizewin -z > - > -if [ -f /etc/installerconfig ]; then > - if 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 > - reboot > - else > - bsddialog --backtitle "FreeBSD 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 CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 > - > -case $? in > -$BSDDIALOG_OK) # Install > - # If not netbooting, have the installer configure the network > - dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` > - if [ ${dlv:=0} -eq 0 -a ! -f /etc/diskless ]; then > - BSDINSTALL_CONFIGCURRENT=yes; export BSDINSTALL_CONFIGCURRENT > - fi > - > - 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 > - > - case $? in > - $BSDDIALOG_OK) # Reboot > - reboot > - ;; > - $BSDDIALOG_EXTRA) # Shutdown > - shutdown -p now > - ;; > - $BSDDIALOG_CANCEL) # Live CD > - exit 0 > - ;; > - esac > - else > - . /etc/rc.local > - fi > - ;; > -$BSDDIALOG_CANCEL) # Live CD > - exit 0 > - ;; > -$BSDDIALOG_EXTRA) # Shell > - clear > - echo "When finished, type 'exit' to return to the installer." > - /bin/sh > - . /etc/rc.local > - ;; > -esac > - > +/usr/libexec/bsdinstall/startbsdinstall > diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc > index 484089d47203..f0ddd90b784c 100644 > --- a/tools/build/mk/OptionalObsoleteFiles.inc > +++ b/tools/build/mk/OptionalObsoleteFiles.inc > @@ -474,6 +474,7 @@ OLD_FILES+=usr/libexec/bsdinstall/runconsoles > OLD_FILES+=usr/libexec/bsdinstall/script > OLD_FILES+=usr/libexec/bsdinstall/scriptedpart > OLD_FILES+=usr/libexec/bsdinstall/services > +OLD_FILES+=usr/libexec/bsdinstall/startbsdinstall > OLD_FILES+=usr/libexec/bsdinstall/time > OLD_FILES+=usr/libexec/bsdinstall/umount > OLD_FILES+=usr/libexec/bsdinstall/wlanconfig > diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile > index d09bef110518..e71cae726536 100644 > --- a/usr.sbin/bsdinstall/Makefile > +++ b/usr.sbin/bsdinstall/Makefile > @@ -10,6 +10,9 @@ GENHDRS= opt_osname.h > SRCS+= ${GENHDRS} > CLEANFILES+= ${GENHDRS} > > +SCRIPTS+= startbsdinstall > +SCRIPTSDIR_startbsdinstall= ${LIBEXECDIR}/bsdinstall > + > opt_osname.h: .PHONY > if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ > echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ > diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall > new file mode 100644 > index 000000000000..3a5a07e85b4d > --- /dev/null > +++ b/usr.sbin/bsdinstall/startbsdinstall > @@ -0,0 +1,97 @@ This commit copy&paste code from scripts/auto to a new file. Why weren't the SPDX, Copyright and License copied and added? I was inactive for a few months. Do we have a new policy to add new files in BASE without legal info, bsd license, etc? https://cgit.freebsd.org/src/tree/usr.sbin/bsdinstall/startbsdinstall > +#!/bin/sh > + > +: ${BSDDIALOG_OK=0} > +: ${BSDDIALOG_CANCEL=1} > +: ${BSDDIALOG_HELP=2} > +: ${BSDDIALOG_EXTRA=3} > +: ${BSDDIALOG_ESC=5} > +: ${BSDDIALOG_ERROR=255} > + > +kbdcontrol -d >/dev/null 2>&1 > +if [ $? -eq 0 ]; then > + # Syscons: use xterm, start interesting things on other VTYs > + TERM=xterm > + > + # Don't send ESC on function-key 62/63 (left/right command key) > + kbdcontrol -f 62 '' > /dev/null 2>&1 > + kbdcontrol -f 63 '' > /dev/null 2>&1 > + > + if [ -z "$EXTERNAL_VTY_STARTED" ]; then > + # Init will clean these processes up if/when the system > + # goes multiuser > + touch /tmp/bsdinstall_log > + tail -f /tmp/bsdinstall_log > /dev/ttyv2 & > + /usr/libexec/getty autologin ttyv3 & > + EXTERNAL_VTY_STARTED=1 > + fi > +else > + # Serial or other console > + echo > + echo "Welcome to FreeBSD!" > + echo > + echo "Please choose the appropriate terminal type for your system." > + echo "Common console types are:" > + echo " ansi Standard ANSI terminal" > + echo " vt100 VT100 or compatible terminal" > + echo " xterm xterm terminal emulator (or compatible)" > + echo > + echo -n "Console type [vt100]: " > + read TERM > + TERM=${TERM:-vt100} > +fi > +export TERM > + > +# Query terminal size; useful for serial lines. > +resizewin -z > + > +if [ -f /etc/installerconfig ]; then > + if 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 > + reboot > + else > + bsddialog --backtitle "FreeBSD 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 CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 > + > +case $? in > +$BSDDIALOG_OK) # Install > + # If not netbooting, have the installer configure the network > + dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` > + if [ ${dlv:=0} -eq 0 -a ! -f /etc/diskless ]; then > + BSDINSTALL_CONFIGCURRENT=yes; export BSDINSTALL_CONFIGCURRENT > + fi > + > + 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 > + > + case $? in > + $BSDDIALOG_OK) # Reboot > + reboot > + ;; > + $BSDDIALOG_EXTRA) # Shutdown > + shutdown -p now > + ;; > + $BSDDIALOG_CANCEL) # Live CD > + exit 0 > + ;; > + esac > + else > + . "$0" > + fi > + ;; > +$BSDDIALOG_CANCEL) # Live CD > + exit 0 > + ;; > +$BSDDIALOG_EXTRA) # Shell > + clear > + echo "When finished, type 'exit' to return to the installer." > + /bin/sh > + . "$0" > + ;; > +esac > +