From nobody Wed Oct 1 12:36:14 2025 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 4ccDtk5XzDz69XWH; Wed, 01 Oct 2025 12:36:14 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccDtk3WJxz3mLJ; Wed, 01 Oct 2025 12:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759322174; 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=21/wSVUfd3TrEjdqvglxZHpyRWUTW6wKLPeBpXZYfMQ=; b=Y/cLDQ6yTlJiu3y45ZI4qFK85UJFJ8dTwebddlYnyr5SfqT25pEmpYO0ox2PEM6juh7gX0 mtZyTkmaMEQJgz9fyZNcvTKdNRI6olDYegavqIUr7LfAVN0FYD5EbamzlVe365JqbDNdTe u2bEyK9G1stFQXFf0eSCMZAmPWrtQquadrA/9xnIHNmK4x96beLdh3rWrbfc9HmznzPDts cAgZ2LehsHmp3BgbZmsl9w7m1Qwc19ex0B16jE1ndP9i869r5nKV6RmJFKgeKVV5jMYFkl IiS8ulhTNKMvJaa6WCR7fHPYPZv4NLjA7BdCHtPZfFYinigSo81Akx4KuGVMuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759322174; 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=21/wSVUfd3TrEjdqvglxZHpyRWUTW6wKLPeBpXZYfMQ=; b=ZlDNTS+8HOpQxaPt5EpzvDnlT+CEQwtOxLDtSGdi3wlBYSpnP0UwjjDa2iiHAv+U8tDVzk XcENYQUpE3qsUniiG41cERc/qTA56IkPD1yKcFeQukr++LWcCTjaBQqcFaYwKK85hr/FuW KoU91TOcfyPxcCojJ7HhSfxWxVhZzsami7/oRfhpjg+yuZIWedM+diXfJ9JqH7TS6stiaz zmqNjitjiUYFz4chOIwdJDyPxy5n+E7GaTf2naqXfDb4acK8AtqzIdFj3m9hh/yv9PzO1W 5/sP+yX60of2+dF0woBf7+I2UocEzr+v6B0vewEu7ZuDOUas0tAyr9uZsqujog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759322174; a=rsa-sha256; cv=none; b=EBlzBxZEkTvO0i+C4/1+v4149lM2qcCbBFEmKq9CBYQ/LCd4zW86RhiHmK3xTr3A5wsbiC EQJ8n0SAY0qXEDEz2cwuM8E/Hvy7w1iousWRmiUw5IQPMjIJGGabwNCidO9l9Yukfz5drY KBnj1+m403QjEUDRud6YV0h54Vd1/e92UQMCifTs5I96IxUIUHigj9YwK0yeYNyaCT1nqy du3j6z5TE2W0dDLT2QiHTuiDeL3RXMLDiiUSGKPtAZ4BYE9KNDBbzWRuZV1sdWcsIzvjr9 rzh8WEK3JKTTLg4s9F8NHepYwpTmKBlKG0BlADigBzlgyfGK76sEigNNTm80Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ccDtk2xFDz79q; Wed, 01 Oct 2025 12:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 591CaE98057698; Wed, 1 Oct 2025 12:36:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 591CaEN5057695; Wed, 1 Oct 2025 12:36:14 GMT (envelope-from git) Date: Wed, 1 Oct 2025 12:36:14 GMT Message-Id: <202510011236.591CaEN5057695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 693aa6bea296 - stable/15 - bsdinstall: Only offer to enable services which are installed 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 693aa6bea29662da5e461486201ec1bf347af8a5 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=693aa6bea29662da5e461486201ec1bf347af8a5 commit 693aa6bea29662da5e461486201ec1bf347af8a5 Author: Lexi Winter AuthorDate: 2025-09-30 06:02:51 +0000 Commit: Lexi Winter CommitDate: 2025-10-01 10:35:23 +0000 bsdinstall: Only offer to enable services which are installed With pkgbase, users may decide to install a minimal set of packages that's missing some daemons. Check which services are installed, and only include the ones which are present in the dialogue. MFC after: 1 day Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D52646 (cherry picked from commit 2507698b630db3d88b0aab12c348873f827255a2) --- usr.sbin/bsdinstall/scripts/services | 49 ++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/services b/usr.sbin/bsdinstall/scripts/services index 93282effbb3f..110b6f321ed1 100755 --- a/usr.sbin/bsdinstall/scripts/services +++ b/usr.sbin/bsdinstall/scripts/services @@ -40,21 +40,44 @@ fi echo -n > $BSDINSTALL_TMPETC/rc.conf.services +DAEMON_OPTIONS="" + +if [ -x "${BSDINSTALL_CHROOT}/etc/rc.d/sshd" ]; then + DAEMON_OPTIONS="$DAEMON_OPTIONS \ + sshd \"Secure shell daemon\" ${sshd_enable:-off}" +fi + +if [ -x "${BSDINSTALL_CHROOT}/etc/rc.d/ntpd" ]; then + DAEMON_OPTIONS="$DAEMON_OPTIONS \ + ntpd \"Synchronize system and network time\" ${ntpd_enable:-off} \ + ntpd_sync_on_start \"Sync time on ntpd startup, even if offset is high\" \ + ${ntpd_sync_on_start:-off}" +fi + +if [ -x "${BSDINSTALL_CHROOT}/etc/rc.d/local_unbound" ]; then + DAEMON_OPTIONS="$DAEMON_OPTIONS \ + local_unbound \"Local caching validating resolver\" \ + ${local_unbound_enable:-off}" +fi + +if [ -x "${BSDINSTALL_CHROOT}/etc/rc.d/powerd" ]; then + DAEMON_OPTIONS="$DAEMON_OPTIONS \ + powerd \"Adjust CPU frequency dynamically if supported\" \ + ${powerd_enable:-off}" +fi + +if [ -x "${BSDINSTALL_CHROOT}/etc/rc.d/moused" ]; then + DAEMON_OPTIONS="$DAEMON_OPTIONS \ + moused \"PS/2 mouse pointer on console\" ${moused_enable:-off}" +fi + exec 5>&1 -DAEMONS=$( bsddialog --backtitle "$OSNAME Installer" \ - --title "System Configuration" --no-cancel --separate-output \ - --checklist "Choose the services you would like to be started at boot:" \ +DAEMONS=$(eval bsddialog --backtitle \"$OSNAME Installer\" \ + --title \"System Configuration\" --no-cancel --separate-output \ + --checklist \"Choose the services you would like to be started at boot:\" \ 0 0 0 \ - local_unbound "Local caching validating resolver" \ - ${local_unbound_enable:-off} \ - sshd "Secure shell daemon" ${sshd_enable:-off} \ - moused "PS/2 mouse pointer on console" ${moused_enable:-off} \ - ntpd "Synchronize system and network time" ${ntpd_enable:-off} \ - ntpd_sync_on_start "Sync time on ntpd startup, even if offset is high" \ - ${ntpd_sync_on_start:-off} \ - powerd "Adjust CPU frequency dynamically if supported" \ - ${powerd_enable:-off} \ - dumpdev "Enable kernel crash dumps to /var/crash" ${dumpdev:-on} \ + $DAEMON_OPTIONS \ + dumpdev \"Enable kernel crash dumps to /var/crash\" ${dumpdev:-on} \ 2>&1 1>&5 ) retval=$? exec 5>&-