From nobody Thu Jun 16 12:51:42 2022 X-Original-To: dev-commits-src-branches@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 8CFF2837209; Thu, 16 Jun 2022 12:51:42 +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 4LP29p3GdPz4lQh; Thu, 16 Jun 2022 12:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655383902; 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=5XM93yH+gA7zaXJV31rcYjRkX0jOcTjgouBC33mbAFg=; b=eKLJxsmIJIRi1Bxpf7jN4jQvT9E8tt8MR5PKgbRoo9wCPtmPN6Npv/4/4r6BpdzMmV+T9U 4PBoLqV1SOn3ZQ31ZN5c5Ep9qElT+nNoLhBGcFwj2RT2n0Ht8pxq0aKxvAE8eeyrO4xKsW zTUz+kN2LEMlXQgEKBXQvX4ttJ/IhsbboloxUov1WG3GYdhvIUoapbojzJgBbqvDpIvOHf QS0vV3BSxMqPZxFJNSHApFiNUyuxTTqy0Oo2qOuo+oJerrq7sKMaDhYbbQuh2pFMiCk05M /fTY5YI8q/nCiX1Nn2gXRnT5/aBX1KhIJnacDYHgoaR7QUk+3yxXCr+02a3QXA== 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 41D3837E4; Thu, 16 Jun 2022 12:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25GCpg1o014423; Thu, 16 Jun 2022 12:51:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25GCpgk7014422; Thu, 16 Jun 2022 12:51:42 GMT (envelope-from git) Date: Thu, 16 Jun 2022 12:51:42 GMT Message-Id: <202206161251.25GCpgk7014422@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: 6678474be71c - stable/13 - makefs: sort cd9660 sysid entries in man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 6678474be71ca9700d0da56d1cfb50150a4b197b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655383902; 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=5XM93yH+gA7zaXJV31rcYjRkX0jOcTjgouBC33mbAFg=; b=ZDrEMYwpfzgvL5AXRkHRwsOSo2wR+qvyYHLpDsv6VouOt0HhT0vvSRqHcmQXKSJ9g1DUM3 Zv70hCoFBSAzmPSqEs8H+LDiw4aNGjvL+H4WHs2iIwdeuIuSIx1UirAmzwCv0PeQz8GyOr Lx8ZKioRI86mioBLUrKEXKp/NAUBWgAQQjweETsy3TpkcmhcZIDRYUQnT/fZokGmfTxci/ VXyPzT79wrUaHyMG5D8uCDjtcOO9DVJYUT04UW2eqG7K3coFsxWp5yDDqhy54KlclHrTOI uzvugkbq3J1v7xS9vixwP7qBr9yhSGD4dd3AEwQpqYvQpA9uLEVs6qcHn2erng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655383902; a=rsa-sha256; cv=none; b=FQ2r9Ur444l+ks38IvL4nAwNmLq9+SxkOjyCuj1JxB5PpldtBw3L8Zao3XjzpG9R3x1UBI ww/oNUHDvqBZzHStOnG0P1gC+cJOg1GXqr9x6xF+f8rxRKHx9yRHMTOMphjaTtwQtG/6Qh WghqeTcawPd+kIuUStsR7AaLnOKrxbqX+aD9mNaZCQoZN10Jzkyu0gLbazccKPUOeNMSIU 98ggeLX8QJXMTiwucJwHgpBa10sZ631+8BvnbL+HoVVdGAzH57ExP8j2Detfdeo+BP2qTw s2zf3pIAPbc6P5+L1uvy7112jnBd09xYfvwDuZXyu3AuPuUsyRGZ82AD2BdFgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6678474be71ca9700d0da56d1cfb50150a4b197b commit 6678474be71ca9700d0da56d1cfb50150a4b197b Author: Ed Maste AuthorDate: 2022-05-18 19:38:54 +0000 Commit: Ed Maste CommitDate: 2022-06-16 12:49:43 +0000 makefs: sort cd9660 sysid entries in man page "efi" was added at the end of the sysid list rather than in alpha order. Move it as a diff reduction against NetBSD. (cherry picked from commit ec3c01ae7233088057395aa50be2439d1abde828) --- usr.sbin/makefs/makefs.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index 4a4c69b06946..fdf8d532b69f 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -385,12 +385,12 @@ Filename of a boot image in the format where .Dq sysid is one of +.Ql efi , .Ql i386 , .Ql mac68k , .Ql macppc , -.Ql powerpc , or -.Ql efi . +.Ql powerpc . .It Sy generic-bootimage Load a generic boot image into the first 32K of the cd9660 image. .It Sy hard-disk-boot