--- loncom/init.d/loncontrol	2003/12/18 21:23:01	1.15
+++ loncom/init.d/loncontrol	2004/01/05 22:36:48	1.16
@@ -48,7 +48,7 @@ sub stop_daemon {
     print("not running\n");
 }
 
-if (($command eq "restart") or ($command eq "reload")) {
+if (($command eq "restartold") or ($command eq "reloadold")) {
     print 'Restarting LON-CAPA'."\n";
     print 'Ending LON-CAPA client and daemon processes'."\n";
     foreach my $daemon ('lonsql','lond','lonc','lonhttpd') {
@@ -57,8 +57,7 @@ if (($command eq "restart") or ($command
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.
 	"\n";
     system("su -c '/home/httpd/perl/loncron' www");
-}
-elsif (($command eq "restartnew") or ($command eq "reloadnew")) {
+} elsif (($command eq "restart") or ($command eq "reload")) {
     print 'Restarting LON-CAPA'."\n";
     print 'Ending LON-CAPA client and daemon processes'."\n";
     foreach my $daemon ('lonsql','lond','lonc','lonhttpd') {
@@ -67,26 +66,22 @@ elsif (($command eq "restartnew") or ($c
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.
 	"\n";
     system("su -c '/home/httpd/perl/loncron new' www");
-}
-elsif ($command eq "stop") {
+} elsif ($command eq "stop") {
     print 'Stopping LON-CAPA'."\n";
     foreach my $daemon ('lonsql','lond','lonc','lonhttpd') {
 	&stop_daemon($daemon);
     }
-}
-elsif ($command eq "start") {
+} elsif ($command eq "startold") {
     print 'Starting LON-CAPA'."\n";
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.
 	"\n"; 
     system("su -c '/home/httpd/perl/loncron' www");
-}
-elsif ($command eq "startnew") {
+} elsif ($command eq "start") {
     print 'Starting LON-CAPA'."\n";
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.
 	"\n"; 
     system("su -c '/home/httpd/perl/loncron new' www");
-}
-elsif ($command eq "status") {
+} elsif ($command eq "status") {
     $response=`/bin/cat /home/httpd/perl/logs/*.pid 2>&1`;
     if ($response=~/No such file or directory/) {
 	print 'LON-CAPA is not running.'."\n";
@@ -94,8 +89,7 @@ elsif ($command eq "status") {
     else {
 	print 'LON-CAPA is running.'."\n";
     }
-}
-else {
+} else {
     print 'You need to specify restart|stop|start|status on the command line'.
 	' argument.'."\n";
 }