diff options
| -rw-r--r-- | installclass.py | 7 | ||||
| -rw-r--r-- | kickstart.py | 10 | ||||
| -rw-r--r-- | todo.py | 1 |
3 files changed, 16 insertions, 2 deletions
diff --git a/installclass.py b/installclass.py index 4754a35c3..ad169ee04 100644 --- a/installclass.py +++ b/installclass.py @@ -68,6 +68,12 @@ class InstallClass: def getLiloInformation(self): return self.lilo + def getFstab(self): + return self.fstab + + def addToFstab(self, mntpoint, dev, fstype = "ext2" , reformat = 1): + self.fstab.append((mntpoint, (dev, fstype, reformat))) + def setTimezoneInfo(self, timezone, asUtc = 0, asArc = 0): self.timezone = (timezone, asUtc, asArc) @@ -201,6 +207,7 @@ class InstallClass: self.defaultRunlevel = None self.postScript = None self.postInChroot = 0 + self.fstab = [] # we need to be able to differentiate between this and custom class DefaultInstall(InstallClass): diff --git a/kickstart.py b/kickstart.py index 9dce7eb04..e2973b08d 100644 --- a/kickstart.py +++ b/kickstart.py @@ -303,9 +303,10 @@ class Kickstart(InstallClass): size = 0 grow = 0 maxSize = 0 + onPart = None (args, extra) = isys.getopt(args, '', [ 'size=', 'maxsize=', - 'grow' ]) + 'grow', 'onpart=' ]) for n in args: (str, arg) = n @@ -315,8 +316,13 @@ class Kickstart(InstallClass): maxSize = int(arg) elif str == '--grow': grow = 1 + elif str == '--onpart': + onPart = arg - self.partitions.append((extra[0], size, maxSize, grow)) + if onPart: + addToFstab(extra[0], onPart) + else: + self.partitions.append((extra[0], size, maxSize, grow)) self.addToSkipList("partition") self.addToSkipList("format") @@ -1137,6 +1137,7 @@ class ToDo: todo.timezone = instClass.getTimezoneInfo() todo.bootdisk = todo.instClass.getMakeBootdisk() todo.zeroMbr = todo.instClass.zeroMbr + todo.mounts = todo.instClass.fstab (where, linear, append) = todo.instClass.getLiloInformation() todo.liloDevice = where |