Date: Wed, 16 Jul 2025 13:36:26 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e48d5d23bbef - main - release: Sort loader.conf lines consistently Message-ID: <202507161336.56GDaQXP036543@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e48d5d23bbef61829aafd594759a2f880a3422f1 commit e48d5d23bbef61829aafd594759a2f880a3422f1 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2025-07-16 13:09:46 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507161336.56GDaQXP036543>