kadischi/post_install_scripts 04userconfig.pl, NONE, 1.1 01prelink.py, 1.1, 1.2 Makefile.am, 1.5, 1.6 04userconfig.py, 1.8, NONE

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	01prelink.py Makefile.am 
Added Files:
	04userconfig.pl 
Removed Files:
	04userconfig.py 
Log Message:
Rewrite of 04userconfig.py to PERL


--- NEW FILE 04userconfig.pl ---
#!/usr/bin/perl -w
#
# Chroot and run some configurations


$SYSDIR = $ARGV[0];
$INTERACTIVE = 1;
$LOKKIT = "$SYSDIR/usr/sbin/lokkit";
$NTSYSV = "$SYSDIR/usr/sbin/ntsysv";

foreach $i (@ARGV) {
    if ($i =~ m/--kickstart/g) {
        $INTERACTIVE = 0;
     }
    elsif ($i =~ m/--cmdline/g) {
        $INTERACTIVE = 0;
     }
    elsif ($i =~ m/-C/g) {
        $INTERACTIVE = 0;
     }
}

if ($INTERACTIVE != 1) {
    print("[kadischi]: Skipping user firewall and services configuration..\n");
}
else {
    $LOKKIT = "$SYSDIR/usr/sbin/lokkit";
    $NTSYSV = "$SYSDIR/usr/sbin/ntsysv";
    
    stat $LOKKIT;
    if ($? == 0) {
    exec("/usr/sbin/chroot $SYSDIR /usr/sbin/lokkit");
    }

    stat $NTSYSV;
    if ($? == 0) {
    exec("/usr/sbin/chroot $SYSDIR /usr/sbin/ntsysv --level 35");
    }
}


Index: 01prelink.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/01prelink.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 01prelink.py	4 Jul 2006 20:56:07 -0000	1.1
+++ 01prelink.py	5 Jul 2006 01:17:00 -0000	1.2
@@ -11,7 +11,7 @@
 conf = os.path.exists(sysdir + "/etc/prelink.conf")
 
 if conf:
-    print("Prelinking..")
+    print("[kadischi]: Prelinking..")
     os.system(("/usr/sbin/chroot %s /usr/sbin/prelink --all >/dev/null 2>&1") % sysdir)
 else:
     print("[kadischi]: No prelink.conf found, wont prelink.")


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am	4 Jul 2006 20:56:07 -0000	1.5
+++ Makefile.am	5 Jul 2006 01:17:00 -0000	1.6
@@ -1,8 +1,9 @@
-PYTHON_FILES = 01prelink.py 03fstab.py 04userconfig.py 05fsclean.py 06sysconfig.py
+PYTHON_FILES = 01prelink.py 03fstab.py 05fsclean.py 06sysconfig.py
 BASH_FILES = 02install.sh 07accounts.sh
+PERL_FILES = 04userconfig.pl
 
 pisdir = $(pkgdatadir)/post_install_scripts
-pis_SCRIPTS = $(PYTHON_FILES) $(BASH_FILES)
+pis_SCRIPTS = $(PYTHON_FILES) $(BASH_FILES) $(PERL_FILES)
 
 uninstall-hook:
 	rm -f $(pisdir)/*.pyc


--- 04userconfig.py DELETED ---