[prev in list] [next in list] [prev in thread] [next in thread]
List: lon-capa-cvs
Subject: [LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml langcheck.piml modify_config_files.piml ntpchec
From: raeburn <raeburn () source ! lon-capa ! org>
Date: 2014-06-29 23:50:26
Message-ID: cvsraeburn1404085826 () cvsserver
[Download RAW message or body]
This is a MIME encoded message
raeburn Sun Jun 29 23:50:26 2014 EDT
Modified files:
/doc/loncapafiles chkconfig.piml langcheck.piml
modify_config_files.piml ntpcheck.piml
picins_check.piml rpmcheck.piml wrap_setuid.piml
Log:
- Support RHEL7 (and CentOS 7 -- prerelease as of 6/25).
["raeburn-20140629235026.txt" (text/plain)]
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.30 doc/loncapafiles/chkconfig.piml:1.31
--- doc/loncapafiles/chkconfig.piml:1.30 Sat May 3 15:31:17 2014
+++ doc/loncapafiles/chkconfig.piml Sun Jun 29 23:50:25 2014
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.30 2014/05/03 15:31:17 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.31 2014/06/29 23:50:25 raeburn Exp $ -->
<!--
@@ -58,7 +58,8 @@
('<DIST />' eq 'fedora18') || ('<DIST />' eq 'fedora19') ||
('<DIST />' eq 'fedora20') || ('<DIST />' eq 'suse12.1') ||
('<DIST />' eq 'suse12.2') || ('<DIST />' eq 'suse12.3') ||
- ('<DIST />' eq 'suse13.1')) {
+ ('<DIST />' eq 'suse13.1') || ('<DIST />' eq 'rhes7') ||
+ ('<DIST />' eq 'centos7') || ('<DIST />' eq 'scientific7')) {
$use_systemctl = 1;
}
exit if (! -x $checker_bin);
Index: doc/loncapafiles/langcheck.piml
diff -u doc/loncapafiles/langcheck.piml:1.6 doc/loncapafiles/langcheck.piml:1.7
--- doc/loncapafiles/langcheck.piml:1.6 Tue Jun 3 20:35:04 2014
+++ doc/loncapafiles/langcheck.piml Sun Jun 29 23:50:25 2014
@@ -61,7 +61,8 @@
}
close(PIPE);
}
-} elsif ('<DIST />' eq 'fedora18' || '<DIST />' eq 'fedora19' || '<DIST />' eq \
'fedora20') { +} elsif ('<DIST />' eq 'fedora18' || '<DIST />' eq 'fedora19' || \
'<DIST />' eq 'fedora20' || + '<DIST />' eq 'rhes7' || '<DIST />' eq \
'centos7' || '<DIST />' eq 'scientific7') { if (open(PIPE,"cat /etc/locale.conf \
|grep '^LANG' |")) { print "Checking OS language";
if (<PIPE> =~ /^LANG="en/) {
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.26 \
doc/loncapafiles/modify_config_files.piml:1.27
--- doc/loncapafiles/modify_config_files.piml:1.26 Tue Jun 3 20:35:04 2014
+++ doc/loncapafiles/modify_config_files.piml Sun Jun 29 23:50:25 2014
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.26 2014/06/03 20:35:04 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.27 2014/06/29 23:50:25 raeburn Exp $ -->
<!--
@@ -49,6 +49,9 @@
('<DIST />' eq 'fedora18') || ('<DIST />' eq 'fedora19') ||
('<DIST />' eq 'fedora20')) {
$mysqlcmd = '/bin/systemctl restart mysqld.service';
+} elsif (('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'scientific7')) {
+ $mysqlcmd = '/bin/systemctl restart mariadb.service';
}
print "\nUpdating $configfiles configuration files\n";
Index: doc/loncapafiles/ntpcheck.piml
diff -u doc/loncapafiles/ntpcheck.piml:1.22 doc/loncapafiles/ntpcheck.piml:1.23
--- doc/loncapafiles/ntpcheck.piml:1.22 Fri Jun 27 08:55:28 2014
+++ doc/loncapafiles/ntpcheck.piml Sun Jun 29 23:50:25 2014
@@ -3,7 +3,7 @@
<!-- ntpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: ntpcheck.piml,v 1.22 2014/06/27 08:55:28 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.23 2014/06/29 23:50:25 raeburn Exp $ -->
<!--
@@ -43,7 +43,9 @@
my $is_running;
if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') ||
('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||
- ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20')) {
+ ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20') ||
+ ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'scientific7')) {
$NTPD = 'ntpd';
$startntpcmd = 'systemctl start ntpd.service';
if (!-e '/usr/sbin/ntpd') {
@@ -85,7 +87,9 @@
}
if (('<DIST />' eq 'fedora15') || ('<DIST />' eq 'fedora16') ||
('<DIST />' eq 'fedora17') || ('<DIST />' eq 'fedora18') ||
- ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20')) {
+ ('<DIST />' eq 'fedora19') || ('<DIST />' eq 'fedora20') ||
+ ('<DIST />' eq 'rhes7') || ('<DIST />' eq 'centos7') ||
+ ('<DIST />' eq 'scientific7')) {
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.24 \
doc/loncapafiles/picins_check.piml:1.25
--- doc/loncapafiles/picins_check.piml:1.24 Sat May 3 15:31:17 2014
+++ doc/loncapafiles/picins_check.piml Sun Jun 29 23:50:25 2014
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.24 2014/05/03 15:31:17 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.25 2014/06/29 23:50:25 raeburn Exp $ -->
<!--
@@ -32,7 +32,7 @@
<piml>
<files>
<file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 \
fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 rhes6 scientific6 centos6 \
sles11 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 \
debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14"> +<perlscript mode="fg" \
dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 \
fedora18 fedora19 fedora20 rhes6 scientific6 centos6 rhes7 scientific7 centos7 sles11 \
suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 debian5 \
debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14"> 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.33 doc/loncapafiles/rpmcheck.piml:1.34
--- doc/loncapafiles/rpmcheck.piml:1.33 Sun Dec 1 22:29:39 2013
+++ doc/loncapafiles/rpmcheck.piml Sun Jun 29 23:50:25 2014
@@ -3,7 +3,7 @@
<!-- phpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: rpmcheck.piml,v 1.33 2013/12/01 22:29:39 raeburn Exp $ -->
+<!-- $Id: rpmcheck.piml,v 1.34 2014/06/29 23:50:25 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 \
fedora18 fedora19 fedora20 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 suse12.3 suse13.1" mode="fg"> +<perlscript \
dist="fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 \
fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 \
fedora19 fedora20 rhes5 rhes6 rhes7 centos5 scientific5 scientific6 centos6 \
scientific7 centos7 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 suse12.3 suse13.1" 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.25 doc/loncapafiles/wrap_setuid.piml:1.26
--- doc/loncapafiles/wrap_setuid.piml:1.25 Sat May 3 15:31:17 2014
+++ doc/loncapafiles/wrap_setuid.piml Sun Jun 29 23:50:25 2014
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.25 2014/05/03 15:31:17 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.26 2014/06/29 23:50:25 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 suse12.3 suse13.1 \
fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 ubuntu12 ubuntu14"> \
+<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 suse12.3 suse13.1 \
fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 ubuntu12 ubuntu14 \
rhes7 centos7 scientific7">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) \
-print|");
_______________________________________________
LON-CAPA-cvs mailing list
LON-CAPA-cvs@mail.lon-capa.org
http://mail.lon-capa.org/mailman/listinfo/lon-capa-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic