diff options
| author | jkh <jkh@FreeBSD.org> | 1999-01-30 22:15:36 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-01-30 22:15:36 +0000 |
| commit | 0c1e072cd8deafca7c47a613a56be76f76d38109 (patch) | |
| tree | 71d573447dc1ddd247ad47a53f95fcaa98fe8058 /release | |
| parent | 1637c076955b8a5740c6ced09c0453d599d73086 (diff) | |
| download | FreeBSD-src-0c1e072cd8deafca7c47a613a56be76f76d38109.zip FreeBSD-src-0c1e072cd8deafca7c47a613a56be76f76d38109.tar.gz | |
1. Install /boot/loader correctly on boot.flp
2. Back up old rc.conf.site if it exists.
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 6 | ||||
| -rw-r--r-- | release/sysinstall/config.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/release/Makefile b/release/Makefile index c23d8d5..281b712 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.462 1999/01/26 15:22:29 jkh Exp $ +# $Id: Makefile,v 1.463 1999/01/29 11:39:03 jkh Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ] # @@ -657,12 +657,12 @@ doMFSKERN: @mkdir ${RD}/image.${FSIMAGE} @cp ${RD}/kernels/BOOTMFS ${RD}/kernels/BOOTMFS.${FSIMAGE} mv ${RD}/kernels/BOOTMFS ${RD}/image.${FSIMAGE}/kernel -.if !defined(_MFSKERN) || ${MACHINE_ARCH} == "alpha" @echo "Setting up /boot directory for ${FSIMAGE} floppy" @mkdir -p ${RD}/image.${FSIMAGE}/boot @cp /boot/* ${RD}/image.${FSIMAGE}/boot @rm -f ${RD}/image.${FSIMAGE}/boot/netboot - + @rm -f ${RD}/image.${FSIMAGE}/boot/loader.old +.if !defined(_MFSKERN) || ${MACHINE_ARCH} == "alpha" @echo "@load /kernel" > ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "@echo Please insert MFS root floppy and press enter:" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "@read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index d83b31d..d661469 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.115 1998/11/15 09:06:19 jkh Exp $ + * $Id: config.c,v 1.116 1999/01/27 02:32:46 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -381,6 +381,8 @@ configRC_conf(char *config) Variable *v; int i, nlines, len; + if (file_readable("/etc/rc.conf.site")) + system("cp /etc/rc.conf.site /etc/rc.conf.site.previous"); rcSite = fopen("/etc/rc.conf.site", "w"); if (!rcSite) return; |
