--- minit-0.10.orig/pidfilehack.c +++ minit-0.10/pidfilehack.c @@ -3,6 +3,8 @@ #include #include #include +#define NOVARS +#include "minit.h" /* purpose: argv[1] is the full path to a PID file, * argv+2 is the daemon to run. @@ -40,7 +42,7 @@ int len=read(fd,buf+2,98); close(fd); if (len>0) { - char* _argv[] = { "msvc", 0, 0, 0 }; + char* _argv[] = { MSVC_NAME, 0, 0, 0 }; if (buf[len+1]=='\n') buf[len+1]=0; else --- minit-0.10.orig/Makefile +++ minit-0.10/Makefile @@ -1,4 +1,4 @@ -all: minit msvc pidfilehack hard-reboot write_proc killall5 shutdown \ +all: minit msvc pidfilehack hard-reboot killall5 shutdown \ minit-update serdo #CFLAGS=-pipe -march=i386 -fomit-frame-pointer -Os -I../dietlibc/include @@ -76,16 +76,17 @@ install-files: install -d $(DESTDIR)/etc/minit $(DESTDIR)/sbin $(DESTDIR)/bin $(DESTDIR)$(MANDIR)/man8 install minit pidfilehack $(DESTDIR)/sbin - install write_proc hard-reboot minit-update $(DESTDIR)/sbin + #install write_proc hard-reboot minit-update $(DESTDIR)/sbin + install hard-reboot minit-update $(DESTDIR)/sbin install msvc serdo $(DESTDIR)/bin install -m 4750 shutdown $(DESTDIR)/sbin - test -f $(DESTDIR)/sbin/init || ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init + #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 install-fifos: -mkfifo -m 600 $(DESTDIR)/etc/minit/in $(DESTDIR)/etc/minit/out -install: install-files install-fifos +install: install-files VERSION=minit-$(shell head -n 1 CHANGES|sed 's/://') CURNAME=$(notdir $(shell pwd)) --- minit-0.10.orig/minit.c +++ minit-0.10/minit.c @@ -115,8 +115,8 @@ int addprocess(struct process *p) { if (maxprocess+1>=processalloc) { struct process *fump; + if ((fump=(struct process *)realloc(root,(processalloc+8)*sizeof(struct process)))==0) return -1; processalloc+=8; - if ((fump=(struct process *)realloc(root,processalloc*sizeof(struct process)))==0) return -1; root=fump; } memmove(&root[++maxprocess],p,sizeof(struct process)); @@ -420,8 +420,8 @@ Argv=argv; - infd=open(MINITROOT "/in",O_RDWR); - outfd=open(MINITROOT "/out",O_RDWR|O_NONBLOCK); + infd=open(MINITFIFOS "/in",O_RDWR); + outfd=open(MINITFIFOS "/out",O_RDWR|O_NONBLOCK); if (getpid()==1) { int fd; @@ -446,7 +446,7 @@ } if (infd<0 || outfd<0) { - _puts("minit: could not open " MINITROOT "/in or " MINITROOT "/out\n"); + _puts("minit: could not open " MINITFIFOS "/in or " MINITFIFOS "/out\n"); sulogin(); nfds=0; } else --- minit-0.10.orig/minit.h +++ minit-0.10/minit.h @@ -1,4 +1,6 @@ #define MINITROOT "/etc/minit" +#define MINITFIFOS "/lib/minit" +#define MSVC_NAME "/sbin/msvc" #ifndef NOVARS static struct process { --- minit-0.10.orig/minit-update.c +++ minit-0.10/minit-update.c @@ -188,10 +188,10 @@ } else die(USAGE); } - infd=open(MINITROOT "/in",O_WRONLY); - outfd=open(MINITROOT "/out",O_RDONLY); + infd=open(MINITFIFOS "/in",O_WRONLY); + outfd=open(MINITFIFOS "/out",O_RDONLY); - if (infd<0 || outfd<0) die("could not open " MINITROOT "/in or " MINITROOT "/out\n"); + if (infd<0 || outfd<0) die("could not open " MINITFIFOS "/in or " MINITFIFOS "/out\n"); while (lockf(infd,F_TLOCK,1)) { buffer_puts_strerror("could not acquire lock: "); --- minit-0.10.orig/debian/minit.dirs +++ minit-0.10/debian/minit.dirs @@ -0,0 +1,6 @@ +bin +sbin +etc/minit +lib/minit +usr/share/lintian/overrides +usr/share/linda/overrides --- minit-0.10.orig/debian/minit.docs +++ minit-0.10/debian/minit.docs @@ -0,0 +1,2 @@ +README +TODO --- minit-0.10.orig/debian/control +++ minit-0.10/debian/control @@ -0,0 +1,18 @@ +Source: minit +Section: admin +Priority: optional +Maintainer: Herve Rousseau +Build-Depends: debhelper (>> 4.0.0), sharutils, dietlibc-dev, libowfat-dev +Standards-Version: 3.7.2 + +Package: minit +Architecture: any +Depends: ${shlibs:Depends} +Description: Small but powerful init system + minit is a replacement for init (but can also be used in parallel) + that has process monitoring capabilities and is somewhat similar to + daemontools from D. J. Bernstein. + . + This package is experimental and not easy to install and use. + . + Homepage: http://www.fefe.de/minit/ --- minit-0.10.orig/debian/minit.postinst +++ minit-0.10/debian/minit.postinst @@ -0,0 +1,21 @@ +#!/bin/sh +# Create the fifos. +if [ ! -e /lib/minit/in ]; then + echo "Creating the FIFOs in /lib/minit..." + mkfifo -m 600 /lib/minit/in +fi +if [ ! -e /lib/minit/out ]; then + mkfifo -m 600 /lib/minit/out +fi +# Ensure the fifos were created... +if [ ! -e /lib/minit/in ]; then + echo "WARNING: could not create FIFO /lib/minit/in" + exit 1 +fi +if [ ! -e /lib/minit/out ]; then + echo "WARNING: could not create FIFO /lib/minit/out" + exit 1 +fi + +#DEBHELPER# + --- minit-0.10.orig/debian/rules +++ minit-0.10/debian/rules @@ -0,0 +1,111 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatibility version to use. +export DH_COMPAT=4 + + + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #/usr/bin/docbook-to-man debian/minit.sgml > minit.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/minit. + $(MAKE) install DESTDIR=$(CURDIR)/debian/minit MANDIR=/usr/share/man + # install listpids + cp listpids $(CURDIR)/debian/minit/sbin/minit-list + # move msvc to sbin + cd $(CURDIR)/debian/minit/ && mv bin/msvc sbin/msvc + # rename shutdown + cd $(CURDIR)/debian/minit/sbin/ && mv shutdown minit-shutdown + + # copy default configuration files + cd debian/minit && uudecode ../etcdir.tgz.uue | tar xz + # copy the ctrlaltdel script from contrib + # no, we use the one included in etcdir.tgz. + #mkdir debian/minit/etc/minit/ctrlaltdel + #cp contrib/ctrlaltdel-run debian/minit/etc/minit/ctrlaltdel/run + #chmod +x debian/minit/etc/minit/ctrlaltdel/run + + # install lintian+linda overrides file + cp debian/minit.lintian $(CURDIR)/debian/minit/usr/share/lintian/overrides/minit + cp debian/minit.linda $(CURDIR)/debian/minit/usr/share/linda/overrides/minit + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit + dh_installcron + dh_installman *.8 + dh_installinfo + dh_installchangelogs CHANGES + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- minit-0.10.orig/debian/minit.linda +++ minit-0.10/debian/minit.linda @@ -0,0 +1,4 @@ +# we use dietlibc, like upstream +Tag: static-binary +# symlinks can't be conffiles +Tag: etc-conffile --- minit-0.10.orig/debian/minit.prerm +++ minit-0.10/debian/minit.prerm @@ -0,0 +1,19 @@ +#!/bin/sh +if [ "$1" = "remove" ]; then + CURRENT_INIT=`readlink -f /proc/1/exe` + # i havn't decided upon the behaviour, if CURRENT_INIT is unknown + if [ "$CURRENT_INIT" = "/sbin/minit" ]; then + echo You must not uninstall minit while running minit >2 + echo Please reboot with your new init first. >2 + fi + # Remove the fifos. + if [ -e /lib/minit/in ]; then + rm /lib/minit/in + fi + if [ -e /lib/minit/out ]; then + rm /lib/minit/out + fi +fi + +#DEBHELPER# + --- minit-0.10.orig/debian/changelog +++ minit-0.10/debian/changelog @@ -0,0 +1,104 @@ +minit (0.10-5build1) hardy; urgency=low + + * Rebuild against new dietlibc. + + -- Luca Falavigna Fri, 14 Mar 2008 16:27:50 +0100 + +minit (0.10-5) unstable; urgency=low + + * New maintainer (Closes: #407656). + * lintian is now happy : statically-linked-binary error on serdo fixed. + + -- Herve Rousseau Fri, 13 Apr 2007 19:34:00 +0200 + +minit (0.10-4) unstable; urgency=low + + * Orphaning package. + + -- Daniel Baumann Sat, 20 Jan 2007 12:20:00 +0100 + +minit (0.10-3) unstable; urgency=low + + * New maintainer (Closes: #334178). + * Bumped policy version. + + -- Daniel Baumann Mon, 4 Sep 2006 11:58:00 +0200 + +minit (0.10-2) unstable; urgency=low + + * QA release. + * Remove all the duplicate man pages in /usr/man. + + -- Joey Hess Sat, 4 Mar 2006 19:55:46 -0500 + +minit (0.10-1) unstable; urgency=low + + * Orphaning upload - I don't use minit anymore, so I give up maintainance. + + * New upstream release + * Use libowfat for building, since this was split out from minit source. + This also fixes str_len.c issues, file was removed (Closes #318552). + * Added fix for (theoretical) potential buffer overflow if a realloc fails + as well as some output fix from the minit mailing list. + * Upgrade standards, dephelper (no changes) + + -- Erich Schubert Sun, 29 Jan 2006 02:19:17 +0100 + +minit (0.9.1.cvs20040418-1) unstable; urgency=low + + * new CVS checkout with bugfix + * really fix that bug (upstream bugfix incomplete) + * added dietlibc-dev to build dependencies (Closes: #244427) + + -- Erich Schubert Sun, 18 Apr 2004 17:36:16 +0200 + +minit (0.9.1.cvs20040324-2) unstable; urgency=low + + * retry uploading to unstable (Closes: #231651) + * quiet linda as well as lintian. Linking statically is intended, + we are using dietlibc and probably even obtain a smaller binary + this way. + Also linda needs to learn that symlinks can't be conffiles... + + -- Erich Schubert Thu, 08 Apr 2004 02:07:28 +0200 + +minit (0.9.1.cvs20040324-1) unstable; urgency=low + + * updated CVS checkout + * some of my changes were included upstream + * re-try upload to unstable after my vacation. I had already + updated the COPYING file in the previous version, but i had only + tried uploading the 20040208-1 version. + * added notes to README.Debian about my runlevel emulation + + -- Erich Schubert Sat, 27 Mar 2004 10:39:26 +0100 + +minit (0.9.1.cvs20040208-2) unstable; urgency=low + + * removed unneeded fcntl-linux.h from source + (this was part of my enitdir work) + * removed note in debian/copyright: upstream CVS does contain + a COPYING file now. + * small cleanup for pidfilehack saving 32 bytes. ;-) + * was missing hard-reboot and minit-update + + -- Erich Schubert Thu, 19 Feb 2004 19:41:32 +0100 + +minit (0.9.1.cvs20040208-1) unstable; urgency=low + + * New upstream CVS checkout + * first version tried to upload + * include a sysv-emulation configuration by default + which can be used for stepwise migration + * modified pidfilehack to search for msvc in /sbin/msvc + * moved msvc to /sbin - it is useable for root only. + * changed FIFO location to /lib/minit. + I don't like having them in /etc/minit (which you might want to + put in CVS etc.) and /lib is expected to be on the root partition. + Using /dev isn't favourable for devfs reasons. + * package refuses to uninstall when /sbin/minit is your current init. + (because you can't properly shut down then) + * remove fifos in prerm, not postrm. + * wrote lots of man pages + + -- Erich Schubert Thu, 19 Feb 2004 13:59:40 +0100 --- minit-0.10.orig/debian/minit.lintian +++ minit-0.10/debian/minit.lintian @@ -0,0 +1,8 @@ +minit: statically-linked-binary ./bin/serdo +minit: statically-linked-binary ./sbin/msvc +minit: statically-linked-binary ./sbin/minit +minit: statically-linked-binary ./sbin/pidfilehack +minit: statically-linked-binary ./sbin/write_proc +minit: statically-linked-binary ./sbin/hard-reboot +minit: statically-linked-binary ./sbin/minit-shutdown +minit: statically-linked-binary ./sbin/minit-update --- minit-0.10.orig/debian/README.Debian +++ minit-0.10/debian/README.Debian @@ -0,0 +1,31 @@ +minit for Debian +---------------- + +This package is **** highly experimental ****. + +To understand how minit works, please read the contributed docs at +http://www.fbunet.de/minit.shtml + +The packaging is likely to go through major changes, which might render +your system unuseable. (i.e. they might drop you to sulogin) +So you really should use this only if you do know how to boot +your system manually. + +To enable minit, append "init=/sbin/minit" to your kernel parameters +in your boot manager (lilo/grub). + +The default debian installation of minit comes with a sysv runlevel +emulation; this should get your system up to a state similar to +runlevel 2 on sysvinit; but you won't gain the benefits of minit with +that scheme. +Instead you need to write service startup scripts for your services +similar to the included "apache" service (if possible, run applications +in foreground instead of using pidfilehack) + +Services properly configured in minit are monitored, can be respawned when +they fail (touch the "respawn" file in the service dir before start) +and you can query the service state using the "msvc" tool. + +minit also allows you to specify depedencies. + + -- Erich Schubert , Sun, 08 Feb 2004 03:09:23 +0100 --- minit-0.10.orig/debian/copyright +++ minit-0.10/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Erich Schubert on +Sun, 21 Jul 2002 03:31:30 +0200. + +It was downloaded from http://www.fefe.de/minit/ + +Upstream Author: Felix von Leitner + +Copyright: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- minit-0.10.orig/debian/etcdir.tgz.uue +++ minit-0.10/debian/etcdir.tgz.uue @@ -0,0 +1,64 @@ +begin 644 - +M'XL(`!=*94```^U=:6_;2!+U5_-75&@C%RR9-W>3..-LUL$:X_%D+6?V0S`( +M:*HE$:%)+0\YAI/_OM7-0V/(T\Q+`'98$OB#>](MNUX; +M4A[_(F#(_W40!=D*6\%#^-3=3@/;@_',M: +M,O_;NL,%@*TC_PYJ@1V0XD3B?X;_H9=XUVF3]UC*OVY6_-NFB>=UVW$LXE\& +MS+]9FJ8@\[JR[JH0UH`%XW_>Y-C/(>9_UWW0_*^)^,\U;.S_QF%Z%41%Q1JN +MTAA;WO_G^4_S9!2,6"L=Y%DW;D((/&3^G]9_KFO2^"\%L_QWV9!%W4:G_^7\ +M.[/QG^V@#"3^):#L]4IQ-,JC61ZM\FB71X=$PO\99ON_L:;XOX[_'%?$_ZY- +M\;\,S/._YOA/Z#^,_UP:_V6@CO\,&MJW$?/]?T/6_QSJ_S*P@/_-B/]MBO]E +M8)9_-F.__&Z+_*/Z3@@7\;X;^ +MM_]/Q'"FK]9Y/^VT;, +M]_\-T7\4_TG!`OXW0O]Q_4_Z;_68Y=_9%/VGD_Z3@7G^UZS_M&+_MVO2^"\# +MM?ZCK=U;B?G^OR'ZSZ#^+P,+^-\,_:>3_I.!,?_(>\A&+&S^&R`/T7_U^U], +MA\__FFN1_I.!1?PWK0"7C__6#/^.X=+W/Z7`4#HD_+88B_I_TPK@T?._H1LF +MG__;[;I6+7:=AU[&&JT8QY;W_T7\I[>1W^0]'J;_Q?O_;$LW^/SOTOX?.5C$ +M?]/O`%C*/^>\Y-_1./^8FM9_I*!BG53`=F+<_[NLY^7A*MX#^L#X3\S_CN:( +M]7_Z_I<M?_ +MQ/J_K9OT_F\I6,3_6M?_BN<_IDG/?Z2@HYS3>+_%6-3_-V']SS5H_4\&%O&_ +M_O4_1Z/Q7P[F^6^^IRW3?X;FSOS^AV/2_B\YV'L"AWR313I0]J!D'M0L\;I! +M%L21%ZI0-0S@GLJ"J-]6V+=AG&1P\>G\[.2/D[.C?;TZ]?'BY(_RG%&=^^WT +M_/3RZ):E>(+Y<#C1YORV^(,DR+HPW_^;_P601\5_EE7L_Z#X3PH6\;_6^$_P +M[PC]1^/_ZJ'3_H^MQJ+^OPGQGZE1_"<#B_A??_QGXR<:_V5@$?_KW/^!_XK] +M'_3];RF@_1_;C?E8O/E[+(G_+!L[>SG_F[;0_V(;./5_"9A:_ZF:``A<#H(4 +M>D'(`(_\6V%QE`97^+$7)^-%H4*7!7$$-T$V`%44H"I[6-R[/!O$R:O=WX+_ +MYIARY$70N8[CA$57>=*'-]?B?'KL!VF6Q%$["M]BKA*[_TARG\%'ALE3>",^ +M'7\,OGE)VX^O)Q.><&:@XP_R*Y9D\$8P==QE5X$7M>.DCVD53/XI:F'&:Q9E +MD`VX$6$8WP117YB#J?-^7ZQM[8U8/@7F#V)( +MT5O[QRJF&/_U^C7FNR]3F6Z<'("EGJ_\X":>]B/T+KR_O#AKO80!K##<-Z1G@A8TF2HT5I?H46^2Q-6=I6LL0;@OI*A=/S2_CWI]-+ +MN.Q\[,V.B2[+5-I;Y_J\/T[9$G. +M>/Y_,KPC-@\F_!^QF[H1U3M0CO:K)47E<^'()T>@JO`GMW^<2,?2/GA!"$&/ +MF].-HV<9?(WB&U%R72I>Y:7<52=^J%"4IF"RB'M.>/13ZO79*]C7X$V5\JT* +M;Y\:/,4W[`VZT@NFZC],V"B(\W1\J^K,T7Z]`"HL,*8L&*-?"G>TNJ"*!=C$GW!, +MNSOA%?1MD*39`<\J'/KKZ=E9V?RQ@0!4?IVH/3?RG).M;=+/# +M7S]KK;__*?[W4MGMQLHNO^W[`?._\M+Y32]7O"-7RG^.MJ_"_:65><'KT[$T`[DG)=Y'M_4CNA< +MOKNXK#PQ=G-5%/?-_79W7F(2;NY]EBRK;6>JMO>0P$(3"]]] +M"*)NL<)?NSZ:;^C8UKI%^C2+AQ,I9QQ1E +MVH9I#TSE+4TY[94=`ZODS=G$B:SM*GJOR(66P9I8,@I\-G;!YX+HL0&%934_94/@=YUM"[O8!G?+265R%`L$<=IW +MA\\4T]VZT'*U5P33)=68Y:>S2O%-V^MTY(NBJFD&8.;"N&"\BG,W$XGX%(D^ +MFS9?L"]FQZ*9

\O]GAK7%D_2T(OS+HL;/H!T!+]/[7^9Q6__V#0_F\Y6,A_PP^`'KC^ +M8UJ6[O('?YKNV`8]_Y>"C[__Y^3BR^\?/FSP&$58'1;V_X8?`"T9_W7#<6;& +M?TK0P+O<9RO/RUXO;2AUV[3_'P`V5_%B%02N['3+H02OR +ML,YE:8#W8UUXEAY7+SS:/SY^!B]>\_"LB'!1F'/A'K%B8BG +MU0-0__7N[%+E2VMJ/1^I4.X6$W<9>$FWE;"K.,Y@7Z>YJC%,!BO-?_.GP"/T +MO^WP?0*ZZ>KT_A\IF.:_^7=_<0C^'[;_H^3?<0V[V/^!_WCMVEU>OQ74C?B? +MY+_IG1\%EL9_Q?X/T]#P/_'\W[)I_Y\-S13-^OW/PZ#+G\*/?#\KTW7;(?XG^6_^=<_+Q__ +M'7NF_]N.1N__DX*"=>5PY"6\ZY>MH(U]3CG,TZ3H@<5)/PN+_0X4?A$(!`*! +L0"`0"`0"@4`@$`@$`H%`(!`(!`*!0"`0"`0"@4`@$`CKP?\`FR*X80#(```` +` +end --- minit-0.10.orig/msvc.8 +++ minit-0.10/msvc.8 @@ -89,7 +89,7 @@ minit is restarting it all the time). .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 +open /lib/minit/in or /lib/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" --- minit-0.10.orig/msvc.c +++ minit-0.10/msvc.c @@ -187,8 +187,8 @@ return 0; } errmsg_iam("msvc"); - infd=open(MINITROOT "/in",O_WRONLY); - outfd=open(MINITROOT "/out",O_RDONLY); + infd=open(MINITFIFOS "/in",O_WRONLY); + outfd=open(MINITFIFOS "/out",O_RDONLY); if (infd>=0) { while (lockf(infd,F_LOCK,1)) { carp("could not acquire lock!"); @@ -268,9 +268,9 @@ if (pid==0) { carp(argv[i],": no such service"); ret=1; - } else if (pid==1) - continue; - else + } else if (pid<=1) { + ret=1; + } else respawn(argv[i],0) || kill(pid,SIGTERM) || kill(pid,SIGCONT); } break; @@ -326,14 +326,14 @@ } 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; } } return ret; } } else { - carp("minit: could not open " MINITROOT "/in or " MINITROOT "/out"); + carp("minit: could not open " MINITFIFOS "/in or " MINITFIFOS "/out"); return 1; } } --- minit-0.10.orig/shutdown.c +++ minit-0.10/shutdown.c @@ -130,8 +130,8 @@ int retval; __write2("Shutting down minit services: \n"); - infd=open(MINITROOT "/in", O_WRONLY); - outfd=open(MINITROOT "/out", O_RDONLY); + infd=open(MINITFIFOS "/in", O_WRONLY); + outfd=open(MINITFIFOS "/out", O_RDONLY); if (infd>=0) { while (lockf(infd, F_TLOCK, 1)) { __write2("could not acquire lock!\n");