diff options
| -rw-r--r-- | fstab.py | 4 | ||||
| -rw-r--r-- | installclass.py | 8 | ||||
| -rw-r--r-- | kickstart.py | 12 | ||||
| -rw-r--r-- | text.py | 5 | ||||
| -rw-r--r-- | todo.py | 7 |
5 files changed, 24 insertions, 12 deletions
@@ -220,7 +220,6 @@ class Fstab: if bootpart[0:2] == "md": return 0 - (drives, raid) = self.partitionList() for (dev, devName, type, start, size, maxcyl, preexist) in drives: @@ -821,7 +820,8 @@ class Fstab: "This most likely means this partition has " "not been formatted.\n\nPress OK to reboot your " "system.") % (device, mntpoint, msg)) - raise SystemError, (errno, msg) +# raise SystemError, (errno, msg) + sys.exit(0) try: os.mkdir (instPath + '/proc') diff --git a/installclass.py b/installclass.py index 4e953306e..f8b8bd73e 100644 --- a/installclass.py +++ b/installclass.py @@ -88,6 +88,12 @@ class BaseInstallClass: self.partitions.append((mntPoint, sizespec, (device, part, primOnly),typespec, fsopts)) + # only defined in kickstart for now + # merges in fstab entries given in ks file + # expects the todo object, currently called from todo::setClass() + def mergeFstabEntries(self, todo): + pass + def addToFstab(self, mntpoint, dev, fstype = "ext2" , reformat = 1): self.fstab.append((mntpoint, (dev, fstype, reformat))) @@ -108,7 +114,7 @@ class BaseInstallClass: "accounts", "dependencies", "language", "keyboard", "xconfig", "welcome", "custom-upgrade", "installtype", "mouse", "confirm-install", "confirm-upgrade", "languagesupport", - "languagedefault" ].index(type) + "languagedefault", "lba32warning" ].index(type) self.skipSteps[type] = 1 def setHostname(self, hostname): diff --git a/kickstart.py b/kickstart.py index fd62826f0..f6c2b7f0a 100644 --- a/kickstart.py +++ b/kickstart.py @@ -42,6 +42,10 @@ class Script: class KickstartBase(BaseInstallClass): + def mergeFstabEntries(self, todo): + for (mntpoint, (dev, fstype, reformat)) in self.fstab: + todo.fstab.addMount(dev, mntpoint, fstype, reformat) + def postAction(self, rootPath, serial): for script in self.postScripts: script.run(rootPath, serial) @@ -109,7 +113,6 @@ class KickstartBase(BaseInstallClass): self.setFirewall(enable, policy, trusts, ports, dhcp, ssh, telnet, smtp, http, ftp) - self.addToSkipList("firewall") def doAuthconfig(self, args): (args, extra) = isys.getopt(args, '', @@ -194,7 +197,7 @@ class KickstartBase(BaseInstallClass): appendLine = None location = "mbr" - linear = 0 + linear = 1 for n in args: (str, arg) = n @@ -610,6 +613,11 @@ class KickstartBase(BaseInstallClass): self.addToSkipList("confirm-install") self.addToSkipList("custom-upgrade") self.addToSkipList("network") + # skipping firewall by default, disabled by default + self.addToSkipList("firewall") + # skip interactive warning about placing boot partition > 1024 cyl + self.addToSkipList("lba32warning") + self.setEarlySwapOn(1) self.partitions = [] self.postScripts = [] @@ -277,6 +277,11 @@ class InstallPathWindow: not todo.expert, todo.method.protectedPartitions(), todo.expert, todo.upgrade) +# +# merge in fstab entries specified in ks +# + todo.instClass.mergeFstabEntries(todo) + return INSTALL_NOOP classes = installclass.availableClasses() @@ -1262,13 +1262,6 @@ class ToDo: todo.silo.setDevice(where) todo.silo.setAppend(append) -# -# only important for ks - not needed here for general case so -# commenting out for now... -# -# for (mntpoint, (dev, fstype, reformat)) in todo.instClass.fstab: -# todo.fstab.addMount(dev, mntpoint, fstype, reformat) - todo.users = [] if todo.instClass.rootPassword: todo.rootpassword.set(todo.instClass.rootPassword, |