Date: Thu, 7 Jan 2016 01:50:50 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r293294 - in stable/10: . sys/boot/forth sys/boot/i386/loader sys/boot/pc98/loader sys/boot/powerpc/ofw sys/boot/powerpc/ps3 sys/boot/sparc64/loader Message-ID: <201601070150.u071oof0086732@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Thu Jan 7 01:50:50 2016 New Revision: 293294 URL: https://svnweb.freebsd.org/changeset/base/293294 Log: MFC r286368: Remove guards around overwriting loader.rc and menu.rc There have been .local version of each for user modifications for some time This allows users to receive future updates to these files PR: 183765 Differential Revision: https://reviews.freebsd.org/D3176 Submitted by: Bertram Scharpf, Nikolai Lifanov (patch) Reviewed by: dteske, loos, eadler Approved by: bapt (mentor) Relnotes: yes Sponsored by: ScaleEngine Inc. Modified: stable/10/UPDATING stable/10/sys/boot/forth/loader.rc stable/10/sys/boot/forth/menu.rc stable/10/sys/boot/i386/loader/Makefile stable/10/sys/boot/pc98/loader/Makefile stable/10/sys/boot/powerpc/ofw/Makefile stable/10/sys/boot/powerpc/ps3/Makefile stable/10/sys/boot/sparc64/loader/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/UPDATING ============================================================================== --- stable/10/UPDATING Thu Jan 7 01:33:42 2016 (r293293) +++ stable/10/UPDATING Thu Jan 7 01:50:50 2016 (r293294) @@ -26,6 +26,11 @@ older version of current is a bit fragil Kernel modules isp_2400_multi and isp_2500_multi were removed and should be replaced with isp_2400 and isp_2500 modules respectively. +20150806: + The menu.rc and loader.rc files will now be replaced during + upgrades. Please migrate local changes to menu.rc.local and + loader.rc.local instead. + 20151026: NTP has been upgraded to 4.2.8p4. Modified: stable/10/sys/boot/forth/loader.rc ============================================================================== --- stable/10/sys/boot/forth/loader.rc Thu Jan 7 01:33:42 2016 (r293293) +++ stable/10/sys/boot/forth/loader.rc Thu Jan 7 01:50:50 2016 (r293294) @@ -1,6 +1,9 @@ \ Loader.rc \ $FreeBSD$ \ +\ You should not edit this file! Put any overrides in loader.rc.local +\ instead as this file can be replaced during system updates. +\ \ Includes additional commands include /boot/loader.4th try-include /boot/loader.rc.local Modified: stable/10/sys/boot/forth/menu.rc ============================================================================== --- stable/10/sys/boot/forth/menu.rc Thu Jan 7 01:33:42 2016 (r293293) +++ stable/10/sys/boot/forth/menu.rc Thu Jan 7 01:50:50 2016 (r293294) @@ -1,6 +1,9 @@ \ Menu.rc \ $FreeBSD$ \ +\ You should not edit this file! Put any overrides in menu.rc.local +\ instead as this file can be replaced during system updates. +\ \ Load required Forth modules include /boot/version.4th include /boot/brand.4th Modified: stable/10/sys/boot/i386/loader/Makefile ============================================================================== --- stable/10/sys/boot/i386/loader/Makefile Thu Jan 7 01:33:42 2016 (r293293) +++ stable/10/sys/boot/i386/loader/Makefile Thu Jan 7 01:50:50 2016 (r293294) @@ -108,12 +108,7 @@ FILESMODE_${LOADER}= ${BINMODE} -b .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" -.if !exists(${DESTDIR}/boot/loader.rc) -FILES+= loader.rc -.endif -.if !exists(${DESTDIR}/boot/menu.rc) -FILES+= menu.rc -.endif +FILES+= loader.rc menu.rc .endif # XXX crt0.o needs to be first for pxeboot(8) to work Modified: stable/10/sys/boot/pc98/loader/Makefile ============================================================================== --- stable/10/sys/boot/pc98/loader/Makefile Thu Jan 7 01:33:42 2016 (r293293) +++ stable/10/sys/boot/pc98/loader/Makefile Thu Jan 7 01:50:50 2016 (r293294) @@ -89,12 +89,7 @@ FILESMODE_${LOADER}= ${BINMODE} -b .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" -.if !exists(${DESTDIR}/boot/loader.rc) -FILES+= ${.CURDIR}/../../i386/loader/loader.rc -.endif -.if !exists(${DESTDIR}/boot/menu.rc) -FILES+= menu.rc -.endif +FILES+= ${.CURDIR}/../../i386/loader/loader.rc menu.rc # XXX crt0.o needs to be first for pxeboot(8) to work OBJS= ${BTXCRT} Modified: stable/10/sys/boot/powerpc/ofw/Makefile ============================================================================== --- stable/10/sys/boot/powerpc/ofw/Makefile Thu Jan 7 01:33:42 2016 (r293293) +++ stable/10/sys/boot/powerpc/ofw/Makefile Thu Jan 7 01:50:50 2016 (r293294) @@ -105,12 +105,6 @@ loader.help: help.common help.ofw .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" -.if !exists(${DESTDIR}/boot/loader.rc) -FILES+= loader.rc -.endif - -.if !exists(${DESTDIR}/boot/menu.rc) -FILES+= menu.rc -.endif +FILES+= loader.rc menu.rc .include <bsd.prog.mk> Modified: stable/10/sys/boot/powerpc/ps3/Makefile ============================================================================== --- stable/10/sys/boot/powerpc/ps3/Makefile Thu Jan 7 01:33:42 2016 (r293293) +++ stable/10/sys/boot/powerpc/ps3/Makefile Thu Jan 7 01:50:50 2016 (r293294) @@ -116,12 +116,6 @@ loader.help: help.common help.ps3 ${.CUR .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" -.if !exists(${DESTDIR}/boot/loader.rc) -FILES+= loader.rc -.endif - -.if !exists(${DESTDIR}/boot/menu.rc) -FILES+= menu.rc -.endif +FILES+= loader.rc menu.rc .include <bsd.prog.mk> Modified: stable/10/sys/boot/sparc64/loader/Makefile ============================================================================== --- stable/10/sys/boot/sparc64/loader/Makefile Thu Jan 7 01:33:42 2016 (r293293) +++ stable/10/sys/boot/sparc64/loader/Makefile Thu Jan 7 01:50:50 2016 (r293294) @@ -98,12 +98,6 @@ loader.help: help.common help.sparc64 .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" -.if !exists(${DESTDIR}/boot/loader.rc) -FILES+= loader.rc -.endif - -.if !exists(${DESTDIR}/boot/menu.rc) -FILES+= menu.rc -.endif +FILES+= loader.rc menu.rc .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601070150.u071oof0086732>