diff options
author | David Cantrell <dcantrell@redhat.com> | 2009-09-01 14:21:04 -1000 |
---|---|---|
committer | David Cantrell <dcantrell@redhat.com> | 2009-09-03 11:30:10 -1000 |
commit | 1ce1ff033efabfc9ad6b731adc51fa6ab06068e4 (patch) | |
tree | 16970c3f9685db2a66d554800708d9b005f2e2db /upgrade.py | |
parent | aad14f014b9cf8c2d9e5e3cfb6521740eb29b002 (diff) | |
download | anaconda-1ce1ff033efabfc9ad6b731adc51fa6ab06068e4.tar.gz anaconda-1ce1ff033efabfc9ad6b731adc51fa6ab06068e4.tar.xz anaconda-1ce1ff033efabfc9ad6b731adc51fa6ab06068e4.zip |
Expose common fsset methods and properties in class Storage.
Add the following methods and properties to class Storage which map
through to FSSet methods, modify existing calls to use the method on
class Storage:
turnOnSwap()
mountFilesystems()
umountFilesystems()
parseFSTab()
mkDevRoot()
createSwapFile()
fsFreeSpace()
mtab
mountpoints
migratableDevices
rootDevice
Callers no longer need to pass the Anaconda object to the FSSet methods
directly. The method on Storage takes care of that.
The mtab() method on FSSet is exposed as a property on Storage. The
same is true for fsFreeSpace().
Diffstat (limited to 'upgrade.py')
-rw-r--r-- | upgrade.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/upgrade.py b/upgrade.py index 826419c31..c751533b1 100644 --- a/upgrade.py +++ b/upgrade.py @@ -108,7 +108,7 @@ def bindMountDevDirectory(instPath): # returns None if no filesystem exist to migrate def upgradeMigrateFind(anaconda): - migents = anaconda.id.storage.fsset.migratableDevices + migents = anaconda.id.storage.migratableDevices if not migents or len(migents) < 1: anaconda.dispatch.skipStep("upgrademigratefs") else: @@ -254,10 +254,10 @@ def upgradeMountFilesystems(anaconda): type="ok") return DISPATCH_BACK - anaconda.id.storage.fsset.parseFSTab(chroot=anaconda.rootPath) + anaconda.id.storage.parseFSTab() if flags.setupFilesystems: - anaconda.id.storage.fsset.turnOnSwap(anaconda, upgrading=True) - anaconda.id.storage.fsset.mkDevRoot(anaconda.rootPath) + anaconda.id.storage.turnOnSwap(upgrading=True) + anaconda.id.storage.mkDevRoot() # Move /etc/rpm/platform out of the way. if os.path.exists(anaconda.rootPath + "/etc/rpm/platform"): |