[patch] cvs patch

minit-0.10-cvs-20070805.diff (text/plain), 3.01 KB, created by Frank Zschockelt on 2007-08-05 12:10:24 UTC

diff -urN minit-0.10/Makefile minit/Makefile
--- minit-0.10/Makefile	2005-04-08 19:24:04.000000000 +0200
+++ minit/Makefile	2005-05-12 17:39:50.000000000 +0200
@@ -78,7 +78,7 @@
 	install minit pidfilehack $(DESTDIR)/sbin
 	install write_proc hard-reboot minit-update $(DESTDIR)/sbin
 	install msvc serdo $(DESTDIR)/bin
-	install -m 4750 shutdown $(DESTDIR)/sbin
+	if test -f $(DESTDIR)/sbin/shutdown; then install shutdown $(DESTDIR)/sbin/mshutdown; else install shutdown $(DESTDIR)/sbin/shutdown; fi
 	test -f $(DESTDIR)/sbin/init || ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init
 	install -m 644 hard-reboot.8 minit-list.8 minit-shutdown.8 minit-update.8 minit.8 msvc.8 pidfilehack.8 serdo.8 $(DESTDIR)$(MANDIR)/man8
 
diff -urN minit-0.10/minit.c minit/minit.c
--- minit-0.10/minit.c	2005-04-08 19:18:40.000000000 +0200
+++ minit/minit.c	2006-02-17 08:42:11.000000000 +0100
@@ -30,9 +30,9 @@
 extern void* __libc_malloc(size_t size);
 extern void* __libc_realloc(void* x,size_t size);
 extern void __libc_free(void* x);
-static char malloc_buf[2048];
+static char malloc_buf[1024];
 static unsigned long n;
-static struct process procbuf[100];
+static struct process procbuf[50];
 void *malloc(size_t size) {
   if (n+size<sizeof(malloc_buf)) {
     char* tmp=malloc_buf+n;
@@ -237,6 +237,21 @@
       req.tv_nsec=500000000;
       nanosleep(&req,0);
     }
+    if ((fd=open("in",O_RDONLY))!=-1) {
+      dup2(fd,0);
+      fcntl(0,F_SETFD,0);
+    }
+    if ((fd=open("out",O_WRONLY))!=-1) {
+      dup2(fd,1);
+      dup2(fd,2);
+      fcntl(1,F_SETFD,0);
+      fcntl(2,F_SETFD,0);
+    }
+    if (!openreadclose("nice",&s,&len)) {
+      int n=atoi(s);
+      nice(n);
+      s=0;
+    }
     if (!openreadclose("params",&s,&len)) {
       argv=split(s,'\n',&argc,2,1);
       if (argv[argc-1]) argv[argc-1]=0; else argv[argc]=0;
diff -urN minit-0.10/msvc.c minit/msvc.c
--- minit-0.10/msvc.c	2005-03-31 19:55:20.000000000 +0200
+++ minit/msvc.c	2005-09-22 14:33:05.000000000 +0200
@@ -326,7 +326,7 @@
 	  }
 	  tmp[fmt_ulong(tmp,sig)]=0;
 	  tmp2[fmt_ulong(tmp2,pid)]=0;
-	  carp(argv[i],": could not send signal ",tmp," to PID ",pid,": ",s);
+	  carp(argv[i],": could not send signal ",tmp," to PID ",tmp2,": ",s);
 	  ret=1;
 	}
       }
diff -urN minit-0.10/README minit/README
--- minit-0.10/README	2002-02-05 17:16:29.000000000 +0100
+++ minit/README	2006-03-25 22:43:48.000000000 +0100
@@ -1,3 +1,5 @@
+To compile this, you need to have libowfat (http://www.fefe.de/libowfat/)!
+
 Each service gets its own directory under /etc/minit (change this in the
 source, it's a #define right at the start of minit.c).
 
@@ -46,6 +48,21 @@
     process dies and is restarted, no log entries will be lost and there
     will be no SIGPIPE.
 
+  nice
+
+    a plain text file containing the value to add to the nice level via the
+    nice systemcall.
+
+  in
+
+    this file is used for stdin.
+
+  out
+
+    this file is used for stdout and stderr.
+    e.g. a symlink to /dev/null
+
+
 Please see http://cr.yp.to/daemontools/multilog.html for a very good
 logging tool.