From 8c1b5a5d9aaea7eea546358a3971d00bedec3f6a Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Thu, 21 Jun 2001 02:42:21 +0000 Subject: re-enabled the postaction on install classes, fixed the fsset support for disk switching (hard to test, broken packaging) --- packages.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'packages.py') 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) -- cgit