diff options
Diffstat (limited to 'anaconda')
| -rwxr-xr-x | anaconda | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -170,6 +170,10 @@ def setupPythonUpdates(): f), "/tmp/updates/%s/%s" %(pypkg, f)) + import shutil + shutil.copyfile("/tmp/updates/70-anaconda.rules", + "/etc/udev/rules.d/70-anaconda.rules") + def parseOptions(): def resolution_cb (option, opt_str, value, parser): parser.values.runres = value @@ -348,12 +352,6 @@ def setupPythonPath(): sys.path.insert(1, '/usr/lib/anaconda/textw') sys.path.insert(2, '/usr/lib/anaconda/iw') - if (os.path.exists('booty')): - sys.path.append('booty') - sys.path.append('booty/edd') - else: - sys.path.append('/usr/lib/booty') - sys.path.append('/usr/share/system-config-date') def addPoPath(dir): @@ -498,6 +496,7 @@ class Anaconda: self.rescue = False self.updateSrc = None self.mediaDevice = None + self.platform = None self.canReIPL = False self.reIPLMessage = None @@ -632,6 +631,9 @@ if __name__ == "__main__": import gettext _ = lambda x: gettext.ldgettext("anaconda", x) + import platform + anaconda.platform = platform.getPlatform(anaconda) + if not iutil.isS390() and os.access("/dev/tty3", os.W_OK): logger.addFileHandler ("/dev/tty3", log) @@ -985,11 +987,10 @@ if __name__ == "__main__": # Skip the disk options in rootpath mode if flags.rootpath: - anaconda.dispatch.skipStep("partitionobjinit", permanent = 1) anaconda.dispatch.skipStep("parttype", permanent = 1) anaconda.dispatch.skipStep("autopartitionexecute", permanent = 1) anaconda.dispatch.skipStep("partition", permanent = 1) - anaconda.dispatch.skipStep("partitiondone", permanent = 1) + anaconda.dispatch.skipStep("storagedone", permanent = 1) anaconda.dispatch.skipStep("bootloader", permanent = 1) anaconda.dispatch.skipStep("bootloaderadvanced", permanent = 1) anaconda.dispatch.skipStep("upgbootloader", permanent = 1) |