From nobody Thu Jun 4 08:50:49 2026 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 4gWJF60mFHz6gK4k for ; Thu, 04 Jun 2026 08:50:50 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gWJF56yh1z414V for ; Thu, 04 Jun 2026 08:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780563050; 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=bi21WlGUvgKaCy6nm/1S12cyo87GPgML9ap2d/ZNHrg=; b=GF1AVp1YoVMmnBC5jyoAeY4gRY+9wIqVRAhBLT7/WS+zXmhsW4fcdy2Q+aIiZhJTwv2qF+ fRKc5eL+IwDVJ7Cpm4K3vGlJcdIgTBhl0ZWZOfFEVCXDhy9dZbo3rP4d8CClhOtMMTSERR BgHypu+QifL04/OQVwiXT7tmVCj7sBdcRUAFkM900nmpszXTHbJbs31Rsfl69SNcz2VOSr smtRIizKhDFLm1QPjFQ3g/Yuk3+f4lmr/XAx6MkqJ7nJh3Pdqp034qcMaGqeUiIaAgiHjg 5NzAvPY5vlMIfg5pXU3M4bEZ+FqnJLlyTEg6ZhGP8E06KjemaaOWlC23QnoWCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780563050; a=rsa-sha256; cv=none; b=U0H2f3Mz09FNkmZG23rhm7O5rx6uMcSL4XJWVTnKBbOfsmtN996JOyWZcFnsgplkLhUQ9K XixRkYu43GtMi+XhvE0hVJo/LCdFNIi2DVbPrIjLeF0nmGsq9klj+kZRYIXgFwYejSqWIh jWATj+QlGusSKYi+tGMdJex7LGzI0nmk1Vu/EMLGSfUTC1r+LWKCf1bFPWJmYJwDeBCE5g RbURcuHnOUif8crnnMEz2QZVWAEqkSbV3y5f5B+QSyWlEgBGNnChFpcFfr+aPQ6Pk2g3U7 bisymChaGqt0e1CPSbH44MzyDinfdNKH/0TSTthR760aSEUZA4h0nv936IVUJA== 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=1780563050; 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=bi21WlGUvgKaCy6nm/1S12cyo87GPgML9ap2d/ZNHrg=; b=Eafm5upoSP6m34Tp1C+hR/SYWf/avQE28mMJM4D7gBg5Wfwq34RbyV3LNKO0m8jfmB4V/D g77hPZOWmnD4VPaodfn71lPdJQAwj7O+94WCqn6gUFP8Jd/ik5aQPFf4AFDSfCLPuicZW9 182G3YMeRDfUv9cPdG8AMCObYAZ5jnYc3hOVwCIAa2oTx+0mMOejS0hEgsFCWsADi7F/f+ SrZyOz100OiM1I9D3Dt0g8aJhxPsjfXr34sgAdxov7fd1uqkLq/QCDQpBAvPVlF00QInl/ +n6XGkbVUH/5gIVRZCKSOuVvpUaVojuEYJOz8LaI0WG0v3siTF4bD/mOrswEIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWJF56WpPzrGQ for ; Thu, 04 Jun 2026 08:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dcd0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 04 Jun 2026 08:50:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 4258829c8f58 - main - Revert "defaultroute: Fix dual-stack and IPv6-only handling" 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4258829c8f588e502d90fe19a0c18ba81a3761d9 Auto-Submitted: auto-generated Date: Thu, 04 Jun 2026 08:50:49 +0000 Message-Id: <6a213c69.3dcd0.1e1c560d@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=4258829c8f588e502d90fe19a0c18ba81a3761d9 commit 4258829c8f588e502d90fe19a0c18ba81a3761d9 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-06-04 08:46:02 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-06-04 08:47:41 +0000 Revert "defaultroute: Fix dual-stack and IPv6-only handling" This reverts commit 5b5a836e72ec2614def23409674822c907cf3740. Despite using arcpatch for this commit, I attributed the wrong author of the patch. --- libexec/rc/rc.d/defaultroute | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/libexec/rc/rc.d/defaultroute b/libexec/rc/rc.d/defaultroute index 5368dca4cf62..b96f91d36118 100755 --- a/libexec/rc/rc.d/defaultroute +++ b/libexec/rc/rc.d/defaultroute @@ -1,6 +1,6 @@ #!/bin/sh # -# Wait for the default route to be up if DHCPv4 or IPv6 SLAAC is in use +# Wait for the default route to be up if DHCP is in use # # @@ -22,7 +22,7 @@ defaultroute_carrier() local carrier nocarrier carrier=1 - for _if in ${dhcp_interfaces} ${autoconf_interfaces}; do + for _if in ${dhcp_interfaces}; do output=`/sbin/ifconfig ${_if}` nocarrier=`expr "${output}" : '.*[[:blank:]]status: \(no carrier\)'` [ -z "${nocarrier}" ] && carrier=0 @@ -32,30 +32,22 @@ defaultroute_carrier() defaultroute_start() { - local have_inet have_inet6 nl waited + local nl waited - # Check for IPv4/IPv6 support - have_inet=0 - afexists inet && have_inet=1 - have_inet6=0 - afexists inet6 && have_inet6=1 - [ ${have_inet} -eq 0 ] && [ ${have_inet6} -eq 0 ] && return + afexists inet || return 0 - # Return without waiting if we don't have dhcp or autoconf interfaces, - # or if none of them is plugged in. - [ ${have_inet} -ne 0 ] && dhcp_interfaces=`list_net_interfaces dhcp` - [ ${have_inet6} -ne 0 ] && autoconf_interfaces=`list_net_interfaces autoconf` - [ -z "${dhcp_interfaces}" -a -z "${autoconf_interfaces}" ] && return + # Return without waiting if we don't have dhcp interfaces or + # if none of the dhcp interfaces is plugged in. + dhcp_interfaces=`list_net_interfaces dhcp` + [ -z "${dhcp_interfaces}" ] && return # Wait for a default route waited=0 while [ ${waited} -lt ${defaultroute_delay} ]; do - [ ${have_inet} -ne 0 ] && defif=`get_default_if -inet` - [ ${have_inet6} -ne 0 ] && defif6=`get_default_if -inet6` - if [ -n "${defif}" ] || [ -n "${defif6}" ]; then + defif=`get_default_if -inet` + if [ -n "${defif}" ]; then if [ ${waited} -ne 0 ]; then - [ -n "${defif}" ] && echo -n "($defif)=>inet " - [ -n "${defif6}" ] && echo -n "($defif6)=>inet6" + echo -n "($defif)" nl=1 fi break