From nobody Sun Oct 18 19:10:12 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 4j77Y539w6z6wH1T for ; Sun, 18 Oct 2026 19:10:17 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j77Y51Rzlz4gVl for ; Sun, 18 Oct 2026 19:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792350617; 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=cXiF0T5s8hF3B2cw9cOQZ25WozrDXPLbvcgTMOArE4M=; b=F93H3o7PRFsP4IVlfjEI9u0pmn9JExNIRJz3c14hyyCbS67XJ4dMn+Zx6o0BZseYnINkFQ tjm8xvtPZKD+mJDywP+wzvXucqobsoPjnYJ07xbClxjORJkYt++VseJC5i/6yv4mkg9GZW H98usY6/aNdECc5ewyZSRnb6GNaplMXithwIGCsYGYIJ0BpWKKYWEwpPG1hBWPAdCuzmRq ajn6+Ec6DOZs0Oqajz2dM1m2TDIQeGbe0FR3/Iqan+fXJY6vf4MPBgq2eiWteygzoqMZv+ 8+6KlVqgsK7UihDu+t5aRNZKgjVf9sGzF85BS4Zmmuj6RbCzKZgdvddWlX5DQg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792350617; b=rroi8bOCxtrHf/svPJmW7JxlOQJnXRWt+7LNBfpR8UL9Xtc9HSvEsLT2wgWc0uEzrPUx5u kEDeXYb+Bbln5I3EFauYKYCcyP+cKoItBdkdEd1z+24xknTHUvHWCmXTTIA1oWANtkN4fj 6MpZ0rwJSuuds0LLH3otf35P/BOUXmgg1CfEoSfyw3dipMQdCvg/HVlndT8GRVPgNba7J0 Phz0qaYrOi4mvA60y+Nr/OiduU4QumlKPt+eiK3YAkzVl8tJ9qbFmYe+QY2qX5JoJM/A0D rwJ+ZlyR/5EYhv2NuympLWtNQq+iqeQl7OMlfGzB1y/LHtRkjSO0Rj4jyYtEWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792350617; 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=cXiF0T5s8hF3B2cw9cOQZ25WozrDXPLbvcgTMOArE4M=; b=XJ3BXVE5OqZCScYMwIPg4eQNu4jrYaTN8mgZqsKFCvc0X/8TkLyYqTdA8xg2vkasE0+I+g Rzu2gA+BDyFaGfcXyGEhuhh3WPiIpmJkLER2OvLlYPCae4/qiedoaPQ1yJA+qKEO+k99b1 QBrkhBL1DEILGj9HyWJIQZ1+fWv0aFFz1702Q6dMfSi8x+Y848pgLqXMWa4eCSCw0Cuu1D LnZYFGfS8HGV+RwuIuhslSJlInre98LTKCwj+/0m7fGyBhRG2aio/2nMlPc4ZbZcY5szKk KP1b0kOG8NFxDRhZafbyKB3hil2H5dR4Y0CXm7a+Ksb9s84K8+hpAdiWRTgFtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j77Y516kTz130V for ; Sun, 18 Oct 2026 19:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32f02 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 18 Oct 2026 19:10:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Devin Teske Subject: git: 49e3c256e461 - main - bsdinstall: use the GPT label for swap in fstab List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: dteske X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49e3c256e4619c56acc09660bc3c49b68ec32c20 Auto-Submitted: auto-generated Date: Sun, 18 Oct 2026 19:10:12 +0000 Message-Id: <6ad51994.32f02.3b9ea03c@gitrepo.freebsd.org> The branch main has been updated by dteske: URL: https://cgit.FreeBSD.org/src/commit/?id=49e3c256e4619c56acc09660bc3c49b68ec32c20 commit 49e3c256e4619c56acc09660bc3c49b68ec32c20 Author: Devin Teske AuthorDate: 2026-10-18 19:06:48 +0000 Commit: Devin Teske CommitDate: 2026-10-18 19:06:48 +0000 bsdinstall: use the GPT label for swap in fstab The GPT layout already labels the swap partition swapN, but fstab named the disk device. That name changes when disks are added or reordered, and swap does not come up until fstab is edited. Write /dev/gpt/swapN instead, appending .eli when swap encryption is on. Mirrored swap still uses /dev/mirror/swap, with the same suffix. Submitted by: Wanpeng Qian Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D32936 --- usr.sbin/bsdinstall/scripts/zfsboot | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index dbf7e19c6f5b..ad1d4370b62e 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -1000,29 +1000,34 @@ zfs_create_diskpart() # Update fstab(5) local swapsize + local suffix= + f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize + if [ "$ZFSBOOT_SWAP_ENCRYPTION" ]; then + suffix=".eli" + fi if [ "$isswapmirror" ]; then # This is not the first disk in the mirror, do nothing elif [ ${swapsize:-0} -eq 0 ]; then # If swap is 0 sized, don't add it to fstab - elif [ "$ZFSBOOT_SWAP_ENCRYPTION" -a "$ZFSBOOT_SWAP_MIRROR" ]; then - f_eval_catch $funcname printf "$PRINTF_FSTAB" \ - /dev/mirror/swap.eli none swap sw 0 0 \ - $BSDINSTALL_TMPETC/fstab || return $FAILURE - isswapmirror=1 elif [ "$ZFSBOOT_SWAP_MIRROR" ]; then f_eval_catch $funcname printf "$PRINTF_FSTAB" \ - /dev/mirror/swap none swap sw 0 0 \ + /dev/mirror/swap$suffix none swap sw 0 0 \ $BSDINSTALL_TMPETC/fstab || return $FAILURE isswapmirror=1 - elif [ "$ZFSBOOT_SWAP_ENCRYPTION" ]; then - f_eval_catch $funcname printf "$PRINTF_FSTAB" \ - /dev/$disk${swappart}.eli none swap sw 0 0 \ - $BSDINSTALL_TMPETC/fstab || return $FAILURE else - f_eval_catch $funcname printf "$PRINTF_FSTAB" \ - /dev/$disk$swappart none swap sw 0 0 \ - $BSDINSTALL_TMPETC/fstab || return $FAILURE + case "$ZFSBOOT_PARTITION_SCHEME" in + GPT*) + f_eval_catch $funcname printf "$PRINTF_FSTAB" \ + /dev/gpt/swap$index$suffix none swap sw 0 0 \ + $BSDINSTALL_TMPETC/fstab || return $FAILURE + ;; + *) + f_eval_catch $funcname printf "$PRINTF_FSTAB" \ + /dev/$disk$swappart$suffix none swap sw 0 0 \ + $BSDINSTALL_TMPETC/fstab || return $FAILURE + ;; + esac fi return $SUCCESS