diff options
| author | Matt Wilson <msw@redhat.com> | 1999-12-21 15:10:28 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-12-21 15:10:28 +0000 |
| commit | 1d68f769a4379cdf2da760dd3f491632b529aa20 (patch) | |
| tree | 4f69b100801efcdbac7edf3f06f2647f828b63ff | |
| parent | 481cd76a8d20940743fc97e727a4a163de7199cd (diff) | |
| download | anaconda-1d68f769a4379cdf2da760dd3f491632b529aa20.tar.gz anaconda-1d68f769a4379cdf2da760dd3f491632b529aa20.tar.xz anaconda-1d68f769a4379cdf2da760dd3f491632b529aa20.zip | |
added lilocheck and driverdisk keywordsanaconda-6-1-1-1
| -rw-r--r-- | kickstart.py | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/kickstart.py b/kickstart.py index 72533e6d9..319027520 100644 --- a/kickstart.py +++ b/kickstart.py @@ -1,4 +1,5 @@ import isys +import os from installclass import InstallClass from installclass import FSEDIT_CLEAR_LINUX from installclass import FSEDIT_CLEAR_ALL @@ -8,7 +9,7 @@ import string class Kickstart(InstallClass): def doRootPw(self, args): - (args, extra) = isys.getopt(args, '', [ 'iscrypted' ]) + (args, extra) = isys.getopt(args, '', [ 'iscrypted=' ]) isCrypted = 0 for n in args: @@ -76,6 +77,18 @@ class Kickstart(InstallClass): self.setLiloInformation(location, linear, appendLine) self.addToSkipList("lilo") + def doLiloCheck (self, args): + drives = isys.hardDriveList ().keys() + drives.sort(isys.compareDrives) + device = drives[0] + isys.makeDevInode(device, '/tmp/' + device) + fd = os.open('/tmp/' + device, os.O_RDONLY) + os.unlink('/tmp/' + device) + block = os.read(fd, 512) + os.close(fd) + if block[6:10] == "LILO": + sys.exit(0) + def doTimezone(self, args): (args, extra) = isys.getopt(args, '', [ 'utc' ]) @@ -195,8 +208,7 @@ class Kickstart(InstallClass): "msbm" : "Microsoft - Bus Mouse" , "mousesystems" : "Mouse Systems - Mouse (serial)" , "mmseries" : "MM - Series (serial)" , - "mmhittab" : "MM - HitTablet (serial)" , - "sun" : "Sun - Mouse" + "mmhittab" : "MM - HitTablet (serial)" } (args, extra) = isys.getopt(args, '', [ 'device=', 'emulthree', @@ -233,11 +245,13 @@ class Kickstart(InstallClass): "cdrom" : None , "clearpart" : self.doClearPart , "device" : None , + "driverdisk" : None , "harddrive" : None , "install" : self.doInstall , "keyboard" : self.doKeyboard , "lang" : self.doLang , "lilo" : self.doLilo , + "lilocheck" : self.doLiloCheck , "mouse" : self.doMouse , "network" : self.doNetwork , "nfs" : None , |