diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-06-30 05:05:08 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-06-30 05:05:08 +0000 |
| commit | d4ed4196e1bf43c7f8849183fa27c4de0f4e2b82 (patch) | |
| tree | 6f7a98cbea6b093730496812ad3d6c613f308d73 /image.py | |
| parent | 2a7615304f4783c095ae7fa591ea0c20bc3e1aae (diff) | |
| download | anaconda-d4ed4196e1bf43c7f8849183fa27c4de0f4e2b82.tar.gz anaconda-d4ed4196e1bf43c7f8849183fa27c4de0f4e2b82.tar.xz anaconda-d4ed4196e1bf43c7f8849183fa27c4de0f4e2b82.zip | |
2006-06-30 Jeremy Katz <katzj@redhat.com>
* scripts/mk-images: Move second stage images to images/ dir.
* image.py: Adjust for stage2 in images/
* loader2/cdinstall.c: Likewise.
* loader2/hdinstall.c: Likewise.
* loader2/method.c: Likewise.
* loader2/nfsinstall.c: Likewise.
* loader2/urlinstall.c: Likewise.
Diffstat (limited to 'image.py')
| -rw-r--r-- | image.py | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -1,7 +1,7 @@ # # image.py - Install method for disk image installs (CD & NFS) # -# Copyright 1999-2004 Red Hat, Inc. +# Copyright 1999-2006 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -151,7 +151,7 @@ class CdromInstallMethod(ImageInstallMethod): if self.loopbackFile: isys.makeDevInode("loop0", "/tmp/loop") isys.lochangefd("/tmp/loop", - "%s/%s/base/stage2.img" % (self.tree, productPath)) + "%s/images/stage2.img" % (self.tree,)) self.loopbackFile = None def systemMounted(self, fsset, chroot): @@ -162,7 +162,7 @@ class CdromInstallMethod(ImageInstallMethod): try: win = self.waitWindow (_("Copying File"), _("Transferring install image to hard drive...")) - iutil.copyFile("%s/%s/base/stage2.img" % (self.tree, productPath), + iutil.copyFile("%s/images/stage2.img" % (self.tree,), self.loopbackFile) win.pop() except Exception, e: @@ -415,10 +415,9 @@ def findIsoImages(path, messageWindow): if num not in discNum or discArch != arch: continue - # if it's disc1, it needs to have product/base/stage2.img + # if it's disc1, it needs to have images/stage2.img if (num == 1 and not - os.access("/mnt/cdimage/%s/base/stage2.img" % (productPath,), - os.R_OK)): + os.access("/mnt/cdimage/images/stage2.img", os.R_OK)): log.warning("%s doesn't have a stage2.img, skipping" %(what,)) continue # we only install binary packages and they have to be |