From 874455669aec86557c26f1769f42e8505785b545 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Tue, 2 Jun 2009 11:25:40 -0400
Subject: Remove driverdisk --type, since mount can figure that out.

---
 loader/driverdisk.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'loader')

diff --git a/loader/driverdisk.c b/loader/driverdisk.c
index 9e7a30dd2..4edd2a94c 100644
--- a/loader/driverdisk.c
+++ b/loader/driverdisk.c
@@ -550,8 +550,7 @@ void getDDFromSource(struct loaderData_s * loaderData, char * src) {
 
 }
 
-static void getDDFromDev(struct loaderData_s * loaderData, char * dev, 
-                         char * fstype);
+static void getDDFromDev(struct loaderData_s * loaderData, char * dev);
 
 void useKickstartDD(struct loaderData_s * loaderData,
                     int argc, char ** argv) {
@@ -565,12 +564,13 @@ void useKickstartDD(struct loaderData_s * loaderData,
     poptContext optCon;
     int rc;
     struct poptOption ksDDOptions[] = {
+        /* The --type option is deprecated and now has no effect. */
         { "type", '\0', POPT_ARG_STRING, &fstype, 0, NULL, NULL },
         { "source", '\0', POPT_ARG_STRING, &src, 0, NULL, NULL },
         { "biospart", '\0', POPT_ARG_NONE, &usebiosdev, 0, NULL, NULL },
         { 0, 0, 0, 0, 0, 0, 0 }
     };
-    
+
     optCon = poptGetContext(NULL, argc, (const char **) argv, ksDDOptions, 0);
     if ((rc = poptGetNextOpt(optCon)) < -1) {
         newtWinMessage(_("Kickstart Error"), _("OK"),
@@ -606,20 +606,14 @@ void useKickstartDD(struct loaderData_s * loaderData,
     }
 
     if (dev) {
-        return getDDFromDev(loaderData, dev, fstype);
+        return getDDFromDev(loaderData, dev);
     } else {
         return getDDFromSource(loaderData, src);
     }
 }
 
-static void getDDFromDev(struct loaderData_s * loaderData, char * dev, 
-                        char * fs) {
-    if (fs) {
-        if (doPwMount(dev, "/tmp/drivers", fs, "ro", NULL)) {
-            logMessage(ERROR, "unable to mount %s as %s", dev, fs);
-            return;
-        }
-    } else if (doPwMount(dev, "/tmp/drivers", "auto", "ro", NULL)) {
+static void getDDFromDev(struct loaderData_s * loaderData, char * dev) {
+    if (doPwMount(dev, "/tmp/drivers", "auto", "ro", NULL)) {
         logMessage(ERROR, "unable to mount driver disk %s", dev);
         return;
     }
-- 
cgit