d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to using a standard /boot directory including the GENERIC kernel

Browse Source 
on CD's 1 and 2.  Create a simple /boot/loader.conf on each CD that loads
/boot/mfsroot.gz as a mfs_root image.  The mfsroot moved from /mfsroot.gz
to /boot/mfsroot.gz so that all of the boot stuff is in /boot.  This allows
a full kernel to be used when installing from CD on all architectures
that support CD booting.  Note that on x86, this requires using
/boot/cdboot as a no-emulation boot image instead of /floppies/boot.flp.
This commit is contained in:
John Baldwin 2001-11-22 04:02:09 +00:00
parent 9497337452
commit 4c8ef1e668
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=86759
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
release/Makefile
View File

@ -758,16 +758,15 @@ cdrom.1:
@mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT
@mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM
.endif
.if ${MACHINE_ARCH} == "alpha"
@echo "Setting up Alpha CD disc1 for booting"
@cp -Rp ${RD}/image.boot/boot ${CD_DISC1}
@ln -f ${RD}/image.boot/kernel.gz ${CD_DISC1}/kernel.gz
@ln -f ${RD}/image.boot/mfsroot.gz ${CD_DISC1}/mfsroot.gz
@ln -f ${CD_DISC2}/boot/cdboot ${CD_DISC1}/boot
@ln -f ${CD_DISC1}/boot/loader.rc ${CD_DISC2}/boot
@ln -f ${CD_DISC1}/kernel.gz ${CD_DISC2}/kernel.gz
@ln -f ${CD_DISC1}/mfsroot.gz ${CD_DISC2}/mfsroot.gz
.elif ${MACHINE} == "i386"
@echo "Setting up /boot"
@cp -Rp ${CD_DISC2}/boot ${CD_DISC1}
@ln -f ${RD}/image.boot/mfsroot.gz ${CD_DISC1}/boot/mfsroot.gz
@ln -f ${CD_DISC1}/boot/mfsroot.gz ${CD_DISC2}/boot/mfsroot.gz
@echo 'mfsroot_load="YES"' > ${CD_DISC1}/boot/loader.conf
@echo 'mfsroot_type="mfs_root"' >> ${CD_DISC1}/boot/loader.conf
@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC1}/boot/loader.conf
@ln -f ${CD_DISC1}/boot/loader.conf ${CD_DISC2}/boot/loader.conf
.if ${MACHINE} == "i386"
@mkdir -p ${CD_DISC2}/floppies
@cp ${CD_DISC1}/floppies/boot.flp ${CD_DISC2}/floppies
.endif