summaryrefslogtreecommitdiffstats
path: root/instdata.py
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2008-09-23 16:10:23 -1000
committerDavid Cantrell <dcantrell@redhat.com>2008-09-29 08:22:47 -1000
commit61fd2ec47555cedbf012cce7a11a0371166fc43d (patch)
tree1f58c1a4b2c0d7f9664e56b68e03577ad7e8c703 /instdata.py
parent46ed5b7819db492a15a3ce2f620dcda7ec54dc88 (diff)
downloadanaconda-61fd2ec47555cedbf012cce7a11a0371166fc43d.tar.gz
anaconda-61fd2ec47555cedbf012cce7a11a0371166fc43d.tar.xz
anaconda-61fd2ec47555cedbf012cce7a11a0371166fc43d.zip
Whitespace cleanups.
Replace tabs with space-only indentation.
Diffstat (limited to 'instdata.py')
-rw-r--r--instdata.py68
1 files changed, 34 insertions, 34 deletions
diff --git a/instdata.py b/instdata.py
index 135d51eac..bc84b7c02 100644
--- a/instdata.py
+++ b/instdata.py
@@ -57,28 +57,28 @@ log = logging.getLogger("anaconda")
class InstallData:
def reset(self):
- # Reset everything except:
- #
- # - The install language
- # - The keyboard
-
- self.instClass = None
- self.network = network.Network()
- self.iscsi = iscsi.iscsi()
- self.zfcp = zfcp.ZFCP()
- self.firewall = firewall.Firewall()
+ # Reset everything except:
+ #
+ # - The install language
+ # - The keyboard
+
+ self.instClass = None
+ self.network = network.Network()
+ self.iscsi = iscsi.iscsi()
+ self.zfcp = zfcp.ZFCP()
+ self.firewall = firewall.Firewall()
self.security = security.Security()
- self.timezone = timezone.Timezone()
+ self.timezone = timezone.Timezone()
self.timezone.setTimezoneInfo(self.instLanguage.getDefaultTimeZone())
self.users = None
self.rootPassword = { "isCrypted": False, "password": "", "lock": False }
- self.auth = "--enableshadow --passalgo=sha512"
- self.desktop = desktop.Desktop()
+ self.auth = "--enableshadow --passalgo=sha512"
+ self.desktop = desktop.Desktop()
self.upgrade = None
if flags.cmdline.has_key("preupgrade"):
self.upgrade = True
# XXX move fsset and/or diskset into Partitions object?
- self.fsset.reset()
+ self.fsset.reset()
self.diskset = partedUtils.DiskSet(self.anaconda)
self.partitions = partitions.Partitions(self.anaconda)
self.bootloader = bootloader.getBootloader()
@@ -128,10 +128,10 @@ class InstallData:
self.partitions.protected = [dev]
def setInstallProgressClass(self, c):
- self.instProgress = c
+ self.instProgress = c
def setDisplayMode(self, display_mode):
- self.displayMode = display_mode
+ self.displayMode = display_mode
# expects a Keyboard object
def setKeyboard(self, keyboard):
@@ -236,15 +236,15 @@ class InstallData:
def writeKS(self, filename):
- f = open(filename, "w")
+ f = open(filename, "w")
- f.write("# Kickstart file automatically generated by anaconda.\n\n")
+ f.write("# Kickstart file automatically generated by anaconda.\n\n")
f.write("#version=%s\n" % versionToString(DEVEL))
- if self.upgrade:
- f.write("upgrade\n");
- else:
- f.write("install\n");
+ if self.upgrade:
+ f.write("upgrade\n");
+ else:
+ f.write("install\n");
if self.instClass.skipkey:
f.write("key --skip\n")
@@ -273,11 +273,11 @@ class InstallData:
elif m.startswith("ftp://") or m.startswith("http://"):
f.write("url --url=%s\n" % urllib.unquote(m))
- self.instLanguage.writeKS(f)
+ self.instLanguage.writeKS(f)
if not self.isHeadless:
self.keyboard.writeKS(f)
- self.network.writeKS(f)
- self.zfcp.writeKS(f)
+ self.network.writeKS(f)
+ self.zfcp.writeKS(f)
if self.rootPassword["isCrypted"]:
args = " --iscrypted %s" % self.rootPassword["password"]
@@ -297,11 +297,11 @@ class InstallData:
f.write(self.ksdata.services.__str__())
f.write(self.ksdata.reboot.__str__())
- self.firewall.writeKS(f)
- if self.auth.strip() != "":
- f.write("authconfig %s\n" % self.auth)
+ self.firewall.writeKS(f)
+ if self.auth.strip() != "":
+ f.write("authconfig %s\n" % self.auth)
self.security.writeKS(f)
- self.timezone.writeKS(f)
+ self.timezone.writeKS(f)
self.bootloader.writeKS(f)
self.partitions.writeKS(f)
@@ -321,15 +321,15 @@ class InstallData:
def __init__(self, anaconda, extraModules, displayMode, backend = None):
self.displayMode = displayMode
- self.instLanguage = language.Language(self.displayMode)
- self.keyboard = keyboard.Keyboard()
+ self.instLanguage = language.Language(self.displayMode)
+ self.keyboard = keyboard.Keyboard()
self.backend = backend
self.anaconda = anaconda
self.monitor = None
self.videocard = None
self.isHeadless = 0
- self.extraModules = extraModules
- self.fsset = fsset.FileSystemSet()
+ self.extraModules = extraModules
+ self.fsset = fsset.FileSystemSet()
- self.reset()
+ self.reset()