minit

commit e2a0d3a676232a2292e5e9db914c0bd4bd6f6f5e
parent 1c3e697dd49a595480fe4910e5eb54cd21009569
Author: leitner <leitner>
Date:   Thu,  8 Nov 2001 18:01:52 +0000

add man page, twiddle return codes.

Diffstat:
M
CHANGES
 | 
4
++++
A
msvc.8
 | 
80
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
msvc.c
 | 
21
++++++++++++++++-----

3 files changed, 100 insertions(+), 5 deletions(-)
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+0.6:
+  Added tty and session leadership magic and actually got getty to work
+    as init on my laptop, i.e. in production use!
+
 0.5.1:
   cut&paste error, set wrong variable to 0 for keyboard request.
     Thanks, Schulti.
diff --git a/msvc.8 b/msvc.8
@@ -0,0 +1,80 @@
+.TH msvc 8
+.SH NAME
+msvc \- control minit
+.SH SYNOPSIS
+.B msvc
+[
+.B \-[uodpchaitko]
+] [
+.B \-P
+.I pid
+]
+.I service
+.SH DESCRIPTION
+.B msvc
+is the management interface to minit.
+.I service
+is the service directory name relative to /etc/minit.
+.SH OPTIONS
+If no option is given,
+.B msvc
+will just print a small diagnostic message to stdout, saying if the
+service is up, down or finished, which PID it has if it is up, and for
+how long it has been in this state.
+.TP 5
+.B \-u
+Up.
+If the service is not running, start it.
+If the service stops, restart it.
+.TP
+.B \-o
+Once.
+If the service is not running, start it.
+If the service stops, do not restart it.
+.TP
+.B \-d
+Down.
+If the service is running, send it a TERM signal and then a CONT signal.
+After it stops, do not restart it.
+.TP
+.B \-p
+Pause.
+Send the service a STOP signal.
+.TP
+.B \-c
+Continue.
+Send the service a CONT signal.
+.TP
+.B \-h
+Hangup.
+Send the service a HUP signal.
+.TP
+.B \-a
+Alarm.
+Send the service an ALRM signal.
+.TP
+.B \-i
+Interrupt.
+Send the service an INT signal.
+.TP
+.B \-t
+Terminate.
+Send the service a TERM signal.
+.TP
+.B \-k
+Terminate.
+Send the service a KILL signal.
+.TP
+.B \-P \fIpid\fR
+Set PID.
+Tell minit the PID of the service is really \fIpid\fR.  This is useful
+for services that fork themselves in the background but put their real
+PID in a file, typically called /var/run/\fIservice\fR.pid.  Used by
+\fBpidfilehack\fR.
+.SH "RETURN CODES"
+Generally, msvc return zero if everything is OK or 1 on error (could not
+open /etc/minit/in or /etc/minit/out or there is no process with the
+given name).  In diagnostic mode, it will exit 0 if the service is up, 2
+if it is down or 3 if it is finished.
+.SH "SEE ALSO"
+pidfilehack(8), svc(8)
diff --git a/msvc.c b/msvc.c
@@ -108,7 +108,9 @@ main(int argc,char *argv[]) {
 	len=uptime(argv[1]);
 	buffer_putulong(buffer_1,len);
 	buffer_putsflush(buffer_1," seconds\n");
+	if (pid==0) return 2; else if (pid==1) return 3; else return 0;
       }
+      goto error;
     } else {
       int i;
       int sig=0;
@@ -122,27 +124,29 @@ main(int argc,char *argv[]) {
 	case 'i': sig=SIGINT; goto dokill; break;
 	case 't': sig=SIGTERM; goto dokill; break;
 	case 'k': sig=SIGKILL; goto dokill; break;
-	case 'o': /* TODO: start but don't restart */
+	case 'o':
 	  if (startservice(argv[2]) || respawn(argv[2],0)) {
 	    buffer_puts(buffer_2,"Could not start ");
 	    buffer_puts(buffer_2,argv[2]);
 	    buffer_putsflush(buffer_2,"\n");
+	    goto error;
 	  }
 	  break;
-	case 'd': /* TODO: down */
+	case 'd':
 	  pid=__readpid(argv[2]);
 	  if (pid==0) {
 	    buffer_putsflush(buffer_2,"service not found");
-	    return 1;
+	    goto error;
 	  } else if (pid==1)
 	    return 0;
-	  if (respawn(argv[2],0) || kill(pid,SIGTERM));
+	  if (respawn(argv[2],0) || kill(pid,SIGTERM) || kill(pid,SIGCONT));
 	  break;
-	case 'u': /* TODO: up */
+	case 'u':
 	  if (startservice(argv[2]) || respawn(argv[2],1)) {
 	    buffer_puts(buffer_2,"Could not start ");
 	    buffer_puts(buffer_2,argv[2]);
 	    buffer_putsflush(buffer_2,"\n");
+	    goto error;
 	  }
 	  break;
 	case 'P':
@@ -152,6 +156,7 @@ main(int argc,char *argv[]) {
 	      buffer_puts(buffer_2,"Could not set pid of service ");
 	      buffer_puts(buffer_2,argv[2]);
 	      buffer_putsflush(buffer_2,"\n");
+	      goto error;
 	    }
 	}
       }
@@ -163,9 +168,15 @@ dokill:
 	  buffer_puts(buffer_2,"Could not send signal to PID ");
 	  buffer_putulong(buffer_2,pid);
 	  buffer_putsflush(buffer_2,"\n");
+error:
+	  return 1;
 	}
       }
+      return 0;
     }
+  } else {
+    buffer_putsflush(buffer_2,"could not open /etc/minit/in or /etc/minit/out\n");
+    return 1;
   }
 }