diff options
| author | Jeremy Katz <katzj@redhat.com> | 2007-12-06 17:38:24 -0500 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2007-12-06 17:40:09 -0500 |
| commit | f7a7f8030ffae0ed0ec53cf44f2074050faf50a2 (patch) | |
| tree | 25fff7ae11bcdd0817edafa8b38fc37a258b53e1 | |
| parent | de4110589716ccc7449eeb070819bc1c68c7a6a6 (diff) | |
| download | anaconda-f7a7f8030ffae0ed0ec53cf44f2074050faf50a2.tar.gz anaconda-f7a7f8030ffae0ed0ec53cf44f2074050faf50a2.tar.xz anaconda-f7a7f8030ffae0ed0ec53cf44f2074050faf50a2.zip | |
Just drop driver disks into /tmp instead of /tmp/ramfs
| -rw-r--r-- | backend.py | 4 | ||||
| -rw-r--r-- | loader2/driverdisk.c | 8 | ||||
| -rw-r--r-- | yuminstall.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/backend.py b/backend.py index a1e11c072..adbaa1538 100644 --- a/backend.py +++ b/backend.py @@ -62,7 +62,7 @@ class AnacondaBackend: def copyFirmware(self, anaconda): # Multiple driver disks may be loaded, so we need to glob for all # the firmware files in all the driver disk directories. - for f in glob.glob("/tmp/ramfs/DD-*/firmware/*"): + for f in glob.glob("/tmp/DD-*/firmware/*"): try: shutil.copyfile(f, "%s/lib/firmware/" % anaconda.rootPath) except IOError, e: @@ -75,7 +75,7 @@ class AnacondaBackend: for (n, arch, tag) in self.kernelVersionList(anaconda.rootPath): packages.recreateInitrd(n, anaconda.rootPath) - for d in glob.glob("/tmp/ramfs/DD-*"): + for d in glob.glob("/tmp/DD-*"): shutil.copytree(d, "/root/" + os.path.basename(d)) sys.stdout.flush() diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c index 6cbf801ef..f3f9c7c70 100644 --- a/loader2/driverdisk.c +++ b/loader2/driverdisk.c @@ -126,7 +126,7 @@ static int loadDriverDisk(struct loaderData_s *loaderData, char *mntpt) { title[sb.st_size] = '\0'; close(fd); - sprintf(file, "/tmp/ramfs/DD-%d", disknum); + sprintf(file, "/tmp/DD-%d", disknum); mkdirChain(file); if (!FL_CMDLINE(flags)) { @@ -134,16 +134,16 @@ static int loadDriverDisk(struct loaderData_s *loaderData, char *mntpt) { winStatus(40, 3, _("Loading"), _("Reading driver disk...")); } - sprintf(dest, "/tmp/ramfs/DD-%d", disknum); + sprintf(dest, "/tmp/DD-%d", disknum); copyDirectory(mntpt, dest, copyWarnFn, copyErrorFn); location = malloc(sizeof(struct moduleBallLocation)); location->title = strdup(title); - ret = asprintf(&location->path, "/tmp/ramfs/DD-%d/modules.cgz", disknum); + ret = asprintf(&location->path, "/tmp/DD-%d/modules.cgz", disknum); location->version = version; char *fwdir = NULL; - ret = asprintf(&fwdir, "/tmp/ramfs/DD-%d/firmware", disknum); + ret = asprintf(&fwdir, "/tmp/DD-%d/firmware", disknum); if (!access(fwdir, R_OK|X_OK)) { add_fw_search_dir(loaderData, fwdir); stop_fw_loader(loaderData); diff --git a/yuminstall.py b/yuminstall.py index 530f0d0ab..0e2074191 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -466,7 +466,7 @@ class AnacondaYum(YumSorter): extraRepos.append(repo) if self.anaconda.id.extraModules: - for d in glob.glob("/tmp/ramfs/DD-*/rpms"): + for d in glob.glob("/tmp/DD-*/rpms"): dirname = os.path.basename(os.path.dirname(d)) rid = "anaconda-%s" % dirname |