summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-11-08 14:11:37 -0500
committerChris Lumens <clumens@redhat.com>2007-11-20 11:08:46 -0500
commit0b8e9d13d4fb36a9e8b9502244032879acb34be2 (patch)
tree20fbf355d309ad47a875681f94cf159d6d409808
parent5c23f951685353e18043412ece559623a87aec88 (diff)
downloadanaconda-0b8e9d13d4fb36a9e8b9502244032879acb34be2.tar.gz
anaconda-0b8e9d13d4fb36a9e8b9502244032879acb34be2.tar.xz
anaconda-0b8e9d13d4fb36a9e8b9502244032879acb34be2.zip
Remove the ejectCD method as it's redundant.
-rw-r--r--image.py3
-rw-r--r--installmethod.py6
2 files changed, 1 insertions, 8 deletions
diff --git a/image.py b/image.py
index b77748316..5cfaa54dc 100644
--- a/image.py
+++ b/image.py
@@ -125,9 +125,6 @@ class CdromInstallMethod(ImageInstallMethod):
"and then click OK to retry.")
% ("/mnt/source",))
- def ejectCD(self):
- isys.ejectCdrom(self.device, makeDevice=1)
-
def systemMounted(self, fsset, chroot):
if not os.path.exists("%s/images/stage2.img" %(self.tree,)):
log.debug("Not copying non-existent stage2.img")
diff --git a/installmethod.py b/installmethod.py
index 10dca2185..8a5c4247e 100644
--- a/installmethod.py
+++ b/installmethod.py
@@ -64,10 +64,6 @@ class InstallMethod:
def unmountCD(self):
pass
- ## Eject any CD media from the drive.
- def ejectCD(self):
- pass
-
## Switch CDs.
# @param mediano The CD media number to switch to.
# @param filename The file to be read that requires switching media.
@@ -97,7 +93,7 @@ def doMethodComplete(anaconda):
anaconda.method.filesDone()
if not anaconda.isKickstart:
- anaconda.method.ejectCD()
+ isys.ejectCdrom(anaconda.method.device, makeDevice=1)
mtab = "/dev/root / ext3 ro 0 0\n"
for ent in anaconda.id.fsset.entries: