kadischi/post_install_scripts 04userconfig.py,1.3,1.4

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2227/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 
Log Message:
Drop useless code pieces in loop, clean up.


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 04userconfig.py	12 Apr 2006 17:51:42 -0000	1.3
+++ 04userconfig.py	12 Apr 2006 23:12:10 -0000	1.4
@@ -8,33 +8,32 @@
 from functions import run
 from functions import flc_log
 
+
 sysdir = sys.argv[1]
+anaconda_args = sys.argv[2:]
 
-try:
-    anaconda_args = sys.argv[2:]
-except IndexError:
-    anaconda_args = None
+lokkit = os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit"))
+ntsysv = os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv"))
 
-config_done = False
 
 run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))
 
-while config_done == False:
-    if anaconda_args != None:
-        for args in anaconda_args:
-            if args.startswith("--kickstart") or args.startswith("--cmdline") or args.startswith("-C"):
-                flc_log("Skipping interactive user configuration..")
-                config_done = True
-                sys.exit(0)
-            else:
-                if os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv")):
-                    flc_log("Taking you to interactive user configuration..")
-                    run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-                    run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
-                    config_done = True   
+if anaconda_args != []:
+    for args in anaconda_args:
+        if args.startswith("--kickstart") or args.startswith("--cmdline") or args.startswith("-C"):
+            flc_log("Skipping interactive user configuration..")
+            sys.exit(0)
+
+    if (lokkit and ntsysv) == True:
+        flc_log("Taking you to interactive user configuration..")
+        run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
+    else:
+        flc_log("Skipping interactive user configuration..")
+else:
+    if (lokkit and ntsysv) == True:
+        flc_log("Taking you to interactive user configuration..")
+        run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
     else:
-        if os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv")):
-            flc_log("Taking you to interactive user configuration..")
-            run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-            run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
-            config_done = True
+        flc_log("Skipping interactive user configuration..")