[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

firewire load failure bug



dwhite> This bug is still in RC2. Do I need to file a PR to get it fixed?

Hopefully following patch will fix the problem.  It also fixes
"loading add-on kernel modules sometimes fail" problem.

This patch mostly comes from:
	src/release/Makefile rev 1.721
	src/usr.sbin/sysinstall/modules.c rev 1.5

For those interesting this patch, please try these floppy images:

	http://people.freebsd.org/~matusita/20031010-flp/

-- -
Makoto `MAR' Matsushita


Index: Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.536.2.110
diff -c -u -r1.536.2.110 Makefile
--- Makefile	10 May 2003 23:01:29 -0000	1.536.2.110
+++ Makefile	10 Oct 2003 16:47:10 -0000
@@ -658,10 +658,10 @@
 	@echo "Compressing doc files..."
 	@gzip -9 ${RD}/mfsfd/stand/help/*.hlp
 .if exists(${.CURDIR}/${TARGET}/drivers.conf)
-	@mkdir -p ${RD}/mfsfd/stand/modules
+	@mkdir -p ${RD}/mfsfd/modules
 	@awk -f  ${.CURDIR}/scripts/driver-copy2.awk \
 	    ${.CURDIR}/${TARGET}/drivers.conf \
-	    ${RD}/trees/bin/modules ${RD}/mfsfd/stand/modules
+	    ${RD}/trees/bin/modules ${RD}/mfsfd/modules
 .endif
 	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \
 		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
@@ -975,6 +975,7 @@
 	@echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc
 .endif
 	@echo "load -t mfs_root /mfsroot" >> ${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}
Index: sysinstall/modules.c
===================================================================
RCS file: /home/ncvs/src/release/sysinstall/Attic/modules.c,v
retrieving revision 1.2.2.4
diff -c -u -r1.2.2.4 modules.c
--- sysinstall/modules.c	5 Jun 2002 20:13:50 -0000	1.2.2.4
+++ sysinstall/modules.c	10 Oct 2003 16:47:02 -0000
@@ -40,7 +40,7 @@
 /* Prototypes */
 static int		kldModuleFire(dialogMenuItem *self);
 
-#define MODULESDIR "/stand/modules"
+#define MODULESDIR "/modules"
 #define DISTMOUNT "/dist"
 
 void

Visit your host, monkey.org