diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-06-02 11:25:40 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-06-02 11:42:04 -0400 |
| commit | 874455669aec86557c26f1769f42e8505785b545 (patch) | |
| tree | b7ee9009c2205b2405fc33775fd1a67f5ba59fdc /loader | |
| parent | 59c3843f3a37eda3709cce2a1208385a6d968397 (diff) | |
| download | anaconda-874455669aec86557c26f1769f42e8505785b545.tar.gz anaconda-874455669aec86557c26f1769f42e8505785b545.tar.xz anaconda-874455669aec86557c26f1769f42e8505785b545.zip | |
Remove driverdisk --type, since mount can figure that out.
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/driverdisk.c | 18 |
1 files changed, 6 insertions, 12 deletions
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; } |