summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2002-11-04 15:44:57 +0000
committerjhb <jhb@FreeBSD.org>2002-11-04 15:44:57 +0000
commita47cf32c4fec9309af8945f15a5d4cc7d3ca0f42 (patch)
tree9f9c0ddc9290d3b7ed9091fff7441a409231261e /release
parentb8dd64f5ef380fd8a17448566fccf0860a7adc19 (diff)
downloadFreeBSD-src-a47cf32c4fec9309af8945f15a5d4cc7d3ca0f42.zip
FreeBSD-src-a47cf32c4fec9309af8945f15a5d4cc7d3ca0f42.tar.gz
Move the modules in the mfsroot to /modules instead of /stand/modules so
that they aren't copied over into /stand of new installations. Submitted by: matusita Tested on: i386
Diffstat (limited to 'release')
-rw-r--r--release/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/release/Makefile b/release/Makefile
index 7e3c3ec..ec2b612 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -676,11 +676,11 @@ release.9:
.endif
.if defined(SMALLBOOTSIZE)
.if exists(${.CURDIR}/${TARGET}/drivers-small.conf)
- @rm -rf ${RD}/mfsfd/stand/modules
- @mkdir -p ${RD}/mfsfd/stand/modules
+ @rm -rf ${RD}/mfsfd/modules
+ @mkdir -p ${RD}/mfsfd/modules
@awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \
${.CURDIR}/${TARGET}/drivers-small.conf \
- ${RD}/trees/base/boot/kernel ${RD}/mfsfd/stand/modules
+ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules
.endif
sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot-small ${RD} ${MNT} \
${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
@@ -690,11 +690,11 @@ release.9:
${BOOTINODE} ${SMALLBOOTLABEL}
.endif
.if exists(${.CURDIR}/${TARGET}/drivers.conf)
- @rm -rf ${RD}/mfsfd/stand/modules
- @mkdir -p ${RD}/mfsfd/stand/modules
+ @rm -rf ${RD}/mfsfd/modules
+ @mkdir -p ${RD}/mfsfd/modules
@awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \
${.CURDIR}/${TARGET}/drivers.conf \
- ${RD}/trees/base/boot/kernel ${RD}/mfsfd/stand/modules
+ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules
@rm -rf ${RD}/driversfd
@mkdir ${RD}/driversfd
@awk -f ${.CURDIR}/scripts/driver-copy2.awk 3 \
@@ -1030,7 +1030,7 @@ doMFSKERN:
.endif
@echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
@echo "set hint.acpi.0.disabled=1" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
- @echo "set module_path=\"/stand/modules;/dist\"" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
+ @echo "set module_path=\"/modules;/dist\"" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
@echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
@echo "autoboot 10" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
.if ${TARGET_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT}
OpenPOWER on IntegriCloud