--- loader/driverdisk.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/loader/driverdisk.c b/loader/driverdisk.c index 9e7a30d..f54bfa8 100644 --- a/loader/driverdisk.c +++ b/loader/driverdisk.c @@ -550,12 +550,10 @@ 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) { - char * fstype = NULL; char * dev = NULL; char * src = NULL; @@ -565,12 +563,11 @@ void useKickstartDD(struct loaderData_s * loaderData, poptContext optCon; int rc; struct poptOption ksDDOptions[] = { - { "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 +603,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; } -- 1.6.1.3 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list