From nobody Wed Jul 16 13:36:26 2025 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 4bhxsl22Cpz61XDH; Wed, 16 Jul 2025 13:36:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bhxsk5rdlz3Y4W; Wed, 16 Jul 2025 13:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752672986; 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=5xh1nj0YkM5g1swaMlKQftk25QZm2XM4yFJE7EoX00s=; b=QmRMTs/yZ0y3ZBsehpOd6iiwY8Amlg4xz4STjFm6aYrRVfq8ZjGYHK/gH2a+Irqm+0iC46 hQkJDmsQwtQJa6+sNOoqr8Fm6NOGrLXC6z2uE9oDBgZu2Cpaf1F2//13Qa5pGVGpa1rtqR rvwrNzEsqGaGBoIHBW9L9XUEU1mqxlxzVD7BLot3jW8h8X2B+SQqNOk5CZhBVpgz0ZvtDI Hsq4TtAofKPFKDRq1b6U5KEGoT+CN3aPpBe1GJqzBT6D+0h21+6P7zSL2J1WTLnArZBeOj sH3Ql518f4av9P2b4aZQ4M+SAxPRwbffGIHufc7FGJT1Bt0cyf3NMHGxa7Slqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752672986; 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=5xh1nj0YkM5g1swaMlKQftk25QZm2XM4yFJE7EoX00s=; b=aGjMV0XQczkltKn4K5Hq2eqdF0HsS+yjonZMWyDWP9PFyLyzROb4By/tpJA5J9FniLWqnl rmYFBwSPJEsTcABVpzNRFd9b6SOpha8/Nj+hX2VMp7rD/aJ6N8+zhZ1ZC/u8voMPmLeNGD VrBO9swgNk4pTcbtVZU3oKG6TIacImwrKEmzila4szEvWmSxfPD/OvfwsFL23YwEt+HaST Il7fg+hJ88QUzFuDFTLAKm1g0PfUIlGJP3rRQ2B6t2xcpdCDQ1jtZRAiPQgURo779vdGJz 4GGrnQrtwfhTMlUo1i0pY+v0zZeHfe18hVqBUjnbdvrnvvH5/3b3ZvDMxKgJdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752672986; a=rsa-sha256; cv=none; b=ex1WZWoVm1aTh7B28vZj2sXkHObgBq63EsMIOfQo79RT77EOir/uVSdyMJw4FqWdF3QP5H 80tso3EjMx4Fh+ZmnANs7ro/wPVUciMdJUf07dGrnli7Jy52dsu/N0nvsdceXvmY7M7KSq Y4aT7LLEyzngy+58oEGYeV4JUVow9m9Im6Q1608MZSDON6ypyCNpxfW0RxyNVlm+Vj+JOH Q7uDB28LCuq7fnIVtNVLMs3761PcXbTAb/xf8SN97UFSAQ+DnaYOZV3Vg75wJ531xw+D/O 3xQjBCdD89QHH+ADf5okBgMLMsJ+j47FhRqBolUM/bzCd2Y+uEON2ADY1gxoDg== 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 4bhxsk5Ndzz1Qj0; Wed, 16 Jul 2025 13:36:26 +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 56GDaQ6g036546; Wed, 16 Jul 2025 13:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56GDaQXP036543; Wed, 16 Jul 2025 13:36:26 GMT (envelope-from git) Date: Wed, 16 Jul 2025 13:36:26 GMT Message-Id: <202507161336.56GDaQXP036543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e48d5d23bbef - main - release: Sort loader.conf lines consistently 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e48d5d23bbef61829aafd594759a2f880a3422f1 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e48d5d23bbef61829aafd594759a2f880a3422f1 commit e48d5d23bbef61829aafd594759a2f880a3422f1 Author: Ed Maste AuthorDate: 2025-07-16 13:09:46 +0000 Commit: Ed Maste CommitDate: 2025-07-16 13:36:16 +0000 release: Sort loader.conf lines consistently loader_brand was in a different spot in the dvd image compared to the others. Reviewed by: jrm Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51342 --- release/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 84f29983b6c7..7cafd7ddb787 100644 --- a/release/Makefile +++ b/release/Makefile @@ -340,8 +340,8 @@ dvd: ${PKGBASE_REPO} echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf - echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf + echo loader_brand=\"install\" >> ${.TARGET}/boot/loader.conf echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644 link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG