[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml modify_config_files.piml ntpcheck.piml picins_check.piml rpmcheck.piml wrap_setuid.piml

raeburn raeburn at source.lon-capa.org
Sun Jan 6 18:10:50 EST 2013 

raeburn		Sun Jan  6 23:10:50 2013 EDT

  Modified files:              
    /doc/loncapafiles	chkconfig.piml modify_config_files.piml 
                     	ntpcheck.piml picins_check.piml rpmcheck.piml 
                     	wrap_setuid.piml 
  Log:
  - Support for Fedora 18.
  
  
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.24 doc/loncapafiles/chkconfig.piml:1.25
--- doc/loncapafiles/chkconfig.piml:1.24	Fri Oct  5 15:36:21 2012
+++ doc/loncapafiles/chkconfig.piml	Sun Jan  6 23:10:50 2013
@@ -3,7 +3,7 @@
 <!-- checkconfig.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.24 2012/10/05 15:36:21 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.25 2013/01/06 23:10:50 raeburn Exp $ -->
 
 <!--
 
@@ -54,7 +54,8 @@
     $checker_bin = '/usr/sbin/sysv-rc-conf';
     $webserver = 'apache2';
 }
-if (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'suse12.1') ||
+if (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') || 
+    ('<DIST />' eq 'fedora18') || ('<DIST />' eq 'suse12.1') ||
     ('<DIST />' eq 'suse12.2')) {
     $use_systemctl = 1;
 }
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.20 doc/loncapafiles/modify_config_files.piml:1.21
--- doc/loncapafiles/modify_config_files.piml:1.20	Fri Oct  5 15:36:21 2012
+++ doc/loncapafiles/modify_config_files.piml	Sun Jan  6 23:10:50 2013
@@ -3,7 +3,7 @@
 <!-- modify_config_files.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: modify_config_files.piml,v 1.20 2012/10/05 15:36:21 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.21 2013/01/06 23:10:50 raeburn Exp $ -->
 
 <!--
 
@@ -45,7 +45,8 @@
 } elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10'  || '<DIST />' eq 'ubuntu12') {
     $configfiles = 'Apt and MySQL';
     $mysqlcmd = '/etc/init.d/mysql restart';
-} elsif (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17')) {
+} elsif (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') ||
+         ('<DIST />' eq 'fedora18')) {
     $mysqlcmd = '/bin/systemctl restart mysqld.service';  
 }
 
Index: doc/loncapafiles/ntpcheck.piml
diff -u doc/loncapafiles/ntpcheck.piml:1.17 doc/loncapafiles/ntpcheck.piml:1.18
--- doc/loncapafiles/ntpcheck.piml:1.17	Mon Jul 30 01:37:22 2012
+++ doc/loncapafiles/ntpcheck.piml	Sun Jan  6 23:10:50 2013
@@ -3,7 +3,7 @@
 <!-- ntpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: ntpcheck.piml,v 1.17 2012/07/30 01:37:22 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.18 2013/01/06 23:10:50 raeburn Exp $ -->
 
 <!--
 
@@ -41,7 +41,8 @@
 my $checkcmd = 'ps -ef |grep ntp |grep -v grep';
 my $startntpcmd;
 my $is_running;
-if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17')) {
+if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') || 
+    ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18')) {
     $NTPD = 'ntpd';
     $startntpcmd = 'systemctl start ntpd.service';
     if (!-e '/usr/sbin/ntpd') {
@@ -81,7 +82,8 @@
 } else {
     $checking_bin = '/sbin/chkconfig';
 }
-if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17')) {
+if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') || 
+    ('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18')) {
     if (!-l "/etc/systemd/system/multi-user.target.wants/ntpd.service") {  
         print "**** WARNING: ntpd is not configured to run at boot.  To correct this run:\nsystemctl enable ntpd.service\n";
     }
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.18 doc/loncapafiles/picins_check.piml:1.19
--- doc/loncapafiles/picins_check.piml:1.18	Fri Oct  5 15:36:21 2012
+++ doc/loncapafiles/picins_check.piml	Sun Jan  6 23:10:50 2013
@@ -3,7 +3,7 @@
 <!-- picins_check.piml -->
 <!-- Stuart Raeburn -->
 
-<!-- $Id: picins_check.piml,v 1.18 2012/10/05 15:36:21 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.19 2013/01/06 23:10:50 raeburn Exp $ -->
 
 <!--
 
@@ -32,7 +32,7 @@
 <piml>
 <files>
 <file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 rhes6 scientific6 centos6 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 rhes6 scientific6 centos6 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12">
     my $picinspath = '/usr/share/texmf/tex/latex/picins'; 
     my $file = 'picins.sty';
     if (!-e "$picinspath/$file") {
Index: doc/loncapafiles/rpmcheck.piml
diff -u doc/loncapafiles/rpmcheck.piml:1.28 doc/loncapafiles/rpmcheck.piml:1.29
--- doc/loncapafiles/rpmcheck.piml:1.28	Fri Oct  5 15:36:21 2012
+++ doc/loncapafiles/rpmcheck.piml	Sun Jan  6 23:10:50 2013
@@ -3,7 +3,7 @@
 <!-- phpcheck.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: rpmcheck.piml,v 1.28 2012/10/05 15:36:21 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.29 2013/01/06 23:10:50 raeburn Exp $ -->
 
 <!--
 
@@ -81,7 +81,7 @@
     }
 }
 </perlscript>
-<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 rhes5 rhes6 centos5 scientific5 scientific6 centos6 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2" mode="fg">
+<perlscript dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 rhes5 rhes6 centos5 scientific5 scientific6 centos6 suse9.2 suse9.3 suse10.1 suse10.2 suse10.3 sles9 sles10 sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2" mode="fg">
 my $hasprereqs = 0;
 if (open(PIPE,"rpm -q LONCAPA-prerequisites|")) {
     my @lines = (<PIPE>);
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.19 doc/loncapafiles/wrap_setuid.piml:1.20
--- doc/loncapafiles/wrap_setuid.piml:1.19	Fri Oct  5 15:36:22 2012
+++ doc/loncapafiles/wrap_setuid.piml	Sun Jan  6 23:10:50 2013
@@ -3,7 +3,7 @@
 <!-- wrap_setuid.piml -->
 <!-- Guy Albertelli -->
 
-<!-- $Id: wrap_setuid.piml,v 1.19 2012/10/05 15:36:22 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.20 2013/01/06 23:10:50 raeburn Exp $ -->
 
 <!--
 
@@ -37,7 +37,7 @@
 <perlscript mode="fg" dist="default">
 #print("Not wrapping setuid scripts\n");
 </perlscript>
-<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 fedora14 fedora15 fedora16 fedora17 ubuntu12">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 fedora14 fedora15 fedora16 fedora17 fedora18 ubuntu12">
 
 $fslist='<TARGET />';
 open(FIND,  "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");

More information about the LON-CAPA-cvs mailing list