kadischi/post_install_scripts 04userconfig.py,1.1,1.2

Jasper O'neal Hartline (autopsy) fedora-extras-commits at redhat.com
Wed Apr 12 15:30:04 UTC 2006


Author: autopsy

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

Modified Files:
	04userconfig.py 
Log Message:
Check target rather than host for utils


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 04userconfig.py	10 Apr 2006 22:53:32 -0000	1.1
+++ 04userconfig.py	12 Apr 2006 15:30:02 -0000	1.2
@@ -17,8 +17,7 @@
 
 config_done = False
 
-if os.path.isfile("/usr/sbin/authconfig"):
-    run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))
+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:
@@ -28,13 +27,13 @@
                 config_done = True
                 sys.exit(0)
             else:
-                if os.path.isfile("/usr/sbin/lokkit") and os.path.isfile("/usr/sbin/ntsysv"):
+                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   
     else:
-        if os.path.isfile("/usr/sbin/lokkit") and os.path.isfile("/usr/sbin/ntsysv"):
+        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"))




More information about the fedora-extras-commits mailing list