add parallel port modules to stage 2 module ball and load them so that kudzu can automagically try to set up your printer

4 files changed, 22 insertions, 1 deletions

diff --git a/docs/command-line.txt b/docs/command-line.txt
index 376599d08..c402870e6 100644
--- a/docs/command-line.txt
+++ b/docs/command-line.txt
@@ -23,6 +23,8 @@ askmethod       Do not automatically use the CD-ROM as the install
 nousbstorage	Do not load usbstorage module in loader.  May help with
 		device ordering on SCSI systems.
 
+noparport       Do not attempt to load support for parallel ports
+
 noprobe         Do not attempt to detect hw, prompts user instead.
 
 nopcmcia        Ignore PCMCIA controller in system.
diff --git a/loader/loader.c b/loader/loader.c
index 6a7861251..f2f96739a 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -2996,6 +2996,22 @@ static int usbInitialize(moduleList modLoaded, moduleDeps modDeps,
     return 0;
 }
 
+/* This loads the necessary parallel port drivers for printers so that
+   kudzu can autodetect and setup printers in post install*/
+static void initializeParallelPort(moduleList modLoaded, moduleDeps modDeps,
+				   moduleInfoSet modInfo, int flags) {
+#if !defined (__i386__)
+    return;
+#endif
+    if (FL_NOPARPORT(flags)) return;
+
+    logMessage("loading parallel port drivers...");
+    if (mlLoadModuleSet("parport_pc", modLoaded, modDeps, modInfo, flags)) {
+	logMessage("failed to load parport_pc module");
+	return;
+    }
+}
+
 /* This forces a pause between initializing usb and trusting the /proc 
    stuff */
 static void usbInitializeMouse(moduleList modLoaded, moduleDeps modDeps,
@@ -3543,6 +3559,7 @@ int main(int argc, char ** argv) {
     mlLoadModuleSet("raid0:raid1:raid5:msdos:ext3:reiserfs:jfs:xfs:lvm-mod", 
 		    modLoaded, modDeps, modInfo, flags);
 
+    initializeParallelPort(modLoaded, modDeps, modInfo, flags);
 
     usbInitializeMouse(modLoaded, modDeps, modInfo, flags);
 
diff --git a/loader/loader.h b/loader/loader.h
index 8f6523464..90b414618 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -28,6 +28,7 @@
 #define LOADER_FLAGS_MEDIACHECK         (1 << 22)
 #define LOADER_FLAGS_NOUSBSTORAGE       (1 << 23)
 #define LOADER_FLAGS_ASKMETHOD          (1 << 24)
+#define LOADER_FLAGS_NOPARPORT          (1 << 25)
 
 #define FL_TESTING(a)	    ((a) & LOADER_FLAGS_TESTING)
 #define FL_EXPERT(a)	    ((a) & LOADER_FLAGS_EXPERT)
@@ -57,6 +58,7 @@
 #define FL_MEDIACHECK(a)    ((a) & LOADER_FLAGS_MEDIACHECK)
 #define FL_NOUSBSTORAGE(a)  ((a) & LOADER_FLAGS_NOUSBSTORAGE)
 #define FL_ASKMETHOD(a)     ((a) & LOADER_FLAGS_ASKMETHOD)
+#define FL_NOPARPORT(a)     ((a) & LOADER_FLAGS_NOPARPORT)
 
 #define CODE_PCMCIA	1
 
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index ee1ec7a70..cbe1730a9 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -90,7 +90,7 @@ IDEMODS=""
 SCSIMODS="sd_mod sr_mod"
 
 FSMODS="msdos vfat ext3 reiserfs jfs"
-SECSTAGE="agpgart raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st"
+SECSTAGE="agpgart raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
 
 COMMONMODULES="vfat $USBMODS"
 LOCALMODULES="$COMMONMODULES aic7xxx megaraid ncr53c8xx