diff options
| author | Chris Lumens <clumens@redhat.com> | 2007-12-11 12:43:12 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2007-12-11 12:43:12 -0500 |
| commit | eaa6f64b0fb2e2c0d4b36e8e329a32fc63830d72 (patch) | |
| tree | 352f7fb8e2508471d527e6dac551d314b139718f | |
| parent | 50be5f3581d00bdc8c7d3ec8b526689c9b05d45e (diff) | |
| download | anaconda-eaa6f64b0fb2e2c0d4b36e8e329a32fc63830d72.tar.gz anaconda-eaa6f64b0fb2e2c0d4b36e8e329a32fc63830d72.tar.xz anaconda-eaa6f64b0fb2e2c0d4b36e8e329a32fc63830d72.zip | |
When retrying to locate the install CD, don't keep adding /dev/.
| -rw-r--r-- | loader2/cdinstall.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c index 97c3169e2..165348ae2 100644 --- a/loader2/cdinstall.c +++ b/loader2/cdinstall.c @@ -242,13 +242,16 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData, /* JKFIXME: ASSERT -- we have a cdrom device when we get here */ do { for (i = 0; devices[i]; i++) { - char *tmp; + char *tmp = NULL; if (!devices[i]->device) continue; - r = asprintf(&tmp, "/dev/%s", devices[i]->device); - free(devices[i]->device); - devices[i]->device = tmp; + + if (strncmp("/dev/", devices[i]->device, 5)) { + r = asprintf(&tmp, "/dev/%s", devices[i]->device); + free(devices[i]->device); + devices[i]->device = tmp; + } logMessage(INFO,"trying to mount CD device %s on %s", devices[i]->device, location); |