--- doc/loncapafiles/chkconfig.piml	2009/07/14 12:26:29	1.8
+++ doc/loncapafiles/chkconfig.piml	2011/03/03 00:10:19	1.15
@@ -3,7 +3,7 @@
 <!-- checkconfig.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: chkconfig.piml,v 1.8 2009/07/14 12:26:29 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.15 2011/03/03 00:10:19 raeburn Exp $ -->
 
 <!--
 
@@ -37,29 +37,34 @@ http://www.lon-capa.org/
 <perlscript mode="fg">
 my $checker_bin = '/sbin/chkconfig';
 my $webserver ='httpd';
-my @services = ('apache2','loncontrol');
 my @runlevels = qw/3 4 5/;
-my $rlstr = join('',@runlevels);
+my @norunlevels = qw/0 1 6/;
 
 if ('<DIST />' eq 'suse9.3' || '<DIST />' eq 'suse9.2' || '<DIST />' eq 'sles9') {
     $checker_bin = '/';
     $webserver = 'apache';
     @runlevels = qw/3 5/;
-} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1') {
+} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4') {
     $webserver = 'apache2';
-} elsif ('<DIST />' eq 'debian5' ||  '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8') {
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10') {
+    @runlevels = qw/2 3 4 5/;
+    @norunlevels = qw/0 1 6/;
     $checker_bin = '/usr/sbin/sysv-rc-conf';
     $webserver = 'apache2';
 }
 exit if (! -x $checker_bin);
 
-foreach my $service (@services) {
+my $rlstr = join('',@runlevels);
+my $nrlstr = join('',@norunlevels);
+foreach my $service ($webserver,'loncontrol') {
     my $command = $checker_bin.' --list '.$service;
     my $results = `$command`;
     if ($results eq '') {
         print "**** WARNING: $service is not set to run on boot.$/".
         "    Execute the following commands to fix this:".$/;
-        unless ('<DIST />' eq 'debian5' ||  '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8') {
+        if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||  '<DIST />' eq 'ubuntu8' '<DIST />' eq 'ubuntu10') {
+            print "        $checker_bin --level $nrlstr $service off".$/;
+        } else {
              print "        $checker_bin --add $webserver".$/;
         }
         print "        $checker_bin --level $rlstr $service on".$/;