diff options
| author | Matt Wilson <msw@redhat.com> | 2001-06-21 02:42:21 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2001-06-21 02:42:21 +0000 |
| commit | 8c1b5a5d9aaea7eea546358a3971d00bedec3f6a (patch) | |
| tree | 5b2482c5c9e305068a1c050daced65c563964939 /packages.py | |
| parent | 72ac06ea4a04823417bac5776f807949e6ce8a7e (diff) | |
| download | anaconda-8c1b5a5d9aaea7eea546358a3971d00bedec3f6a.tar.gz anaconda-8c1b5a5d9aaea7eea546358a3971d00bedec3f6a.tar.xz anaconda-8c1b5a5d9aaea7eea546358a3971d00bedec3f6a.zip | |
re-enabled the postaction on install classes, fixed the fsset support for disk switching (hard to test, broken packaging)
Diffstat (limited to 'packages.py')
| -rw-r--r-- | packages.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/packages.py b/packages.py index b9da7961e..9780521e5 100644 --- a/packages.py +++ b/packages.py @@ -358,7 +358,9 @@ def doInstall(method, id, intf, instPath): id.hdList['krb5-libs'].selected = 1 xserver = id.videocard.primaryCard().getXServer() - if xserver and id.comps.packages.has_key('XFree86') and id.comps.packages['XFree86'].selected and xserver != "XFree86": + if (xserver and id.comps.packages.has_key('XFree86') + and id.comps.packages['XFree86'].selected + and xserver != "XFree86"): try: id.hdList['XFree86-' + xserver[5:]].selected = 1 except ValueError, message: @@ -376,10 +378,9 @@ def doInstall(method, id, intf, instPath): f = open(instPath + "/etc/mtab", "w+") f.close() - # XXX - #if method.systemMounted (fstab, instPath, id.hdList.selected()): - #fstab.umountFilesystems(instPath) - #return 1 + if method.systemMounted (id.fsset, instPath, id.hdList.selected()): + id.fsset.umountFilesystems(instPath) + return 1 for i in ( '/var', '/var/lib', '/var/lib/rpm', '/tmp', '/dev', '/etc', '/etc/sysconfig', '/etc/sysconfig/network-scripts', @@ -666,7 +667,6 @@ def doInstall(method, id, intf, instPath): # needed for prior systems which were not xinetd based migrateXinetd(instPath, instLogName) - # XXX if flags.setupFilesystems: errors = None @@ -713,8 +713,7 @@ def doInstall(method, id, intf, instPath): w.set(6) - # XXX - #self.instClass.postAction(instPath, self.serial) + self.instClass.postAction(instPath, flags.serial) w.set(7) |