Moved driver modules for some PCI NICs and PCCARD-only NICs to mfsroot.flp.

http://people.freebsd.org/~hosokawa/driver-floppy/ for details.

Reviewed by:	current@FreeBSD.org

3 files changed, 8 insertions, 2 deletions

diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index ee75e66..700dd04 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -12,8 +12,8 @@ CLEANFILES+=	keymap.tmp keymap.h
 SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
 	ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \
-	label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
-	msg.c network.c nfs.c options.c package.c pccard.c \
+	label.c lndir.c main.c makedevs.c media.c menus.c misc.c modules.c \
+	mouse.c msg.c network.c nfs.c options.c package.c pccard.c \
 	system.c tape.c tcpip.c termcap.c ufs.c usb.c user.c variable.c \
 	wizard.c keymap.h
 
diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c
index e48d6c5..67de905 100644
--- a/usr.sbin/sade/main.c
+++ b/usr.sbin/sade/main.c
@@ -101,6 +101,9 @@ main(int argc, char **argv)
     if (DebugFD)
 	dup2(DebugFD, 2);
 
+    /* Initialize driver modules */
+    moduleInitialize();
+
     /* Initialize PC-card */
     pccardInitialize();
 
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 8dab491..d81644a 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -670,6 +670,9 @@ extern WINDOW	*savescr(void);
 extern void	restorescr(WINDOW *w);
 extern char	*sstrncpy(char *dst, const char *src, int size);
 
+/* modules.c */
+extern void	moduleInitialize(void);
+
 /* mouse.c */
 extern int	mousedTest(dialogMenuItem *self);
 extern int	mousedDisable(dialogMenuItem *self);