diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2002-11-04 15:44:57 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2002-11-04 15:44:57 +0000 |
| commit | 70accddf26033601b716c68a8986cbb95d115b16 (patch) | |
| tree | 9f9c0ddc9290d3b7ed9091fff7441a409231261e | |
| parent | e5e820fd1f9a5d788798072f1d2a60f7cc798f70 (diff) | |
Notes
| -rw-r--r-- | release/Makefile | 14 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/modules.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/release/Makefile b/release/Makefile index 7e3c3ec954ade..ec2b612548f18 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} diff --git a/usr.sbin/sysinstall/modules.c b/usr.sbin/sysinstall/modules.c index b969ce46a5e5f..67a8c89dedb79 100644 --- a/usr.sbin/sysinstall/modules.c +++ b/usr.sbin/sysinstall/modules.c @@ -40,7 +40,7 @@ /* Prototypes */ static int kldModuleFire(dialogMenuItem *self); -#define MODULESDIR "/stand/modules" +#define MODULESDIR "/modules" #define DISTMOUNT "/dist" void |