From 66848b15e247b45c536b4122f8c82663e5fc4b83 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Wed, 23 Mar 2011 03:02:08 +0000 Subject: [PATCH] Update mkinit - Change /usr/lib/plan9 prefix to /opt/plan9 - Update bitlbee rule for bitlbee 3.0 - Cleanup spamassassin rule --- init.mk | 2 +- services.mk | 14 ++++++++------ src/initctld.c | 4 ++-- src/mkinit | 2 +- src/mkinit.rc | 4 ++-- src/respawn | 2 +- src/service | 2 +- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/init.mk b/init.mk index 81c1487..3c1b022 100644 --- a/init.mk +++ b/init.mk @@ -2,7 +2,7 @@ # See COPYING for terms # Config -MKSHELL=/usr/lib/plan9/bin/rc +MKSHELL=/opt/plan9/bin/rc NPROC=10 hostname-opts = c diff --git a/services.mk b/services.mk index 0938103..54f7ea5 100644 --- a/services.mk +++ b/services.mk @@ -1,4 +1,4 @@ -MKSHELL=/usr/lib/plan9/bin/rc +MKSHELL=/opt/plan9/bin/rc # Example #test-start:VQPservice -u: foo-start @@ -182,7 +182,11 @@ polipo-stop_cmd=pkill polipo apache2-start_cmd=apache2 apache2-stop_cmd=pkill apache2 -courier-start:VPservice -u: +#bitlbee-start_cmd=sudo -u bitlbee bitlbeed /usr/sbin/bitlbee +bitlbee-start_cmd=bitlbee -D -u bitlbee +bitlbee-stop_cmd=pkill bitlbeed + +courier-start:VPservice -u: fsclean-start $P install -o mail -g mail -d /var/run/courier $P authdaemond start $P courier start @@ -200,10 +204,8 @@ mysql-start:VPservice -u: fsclean-start service -U $target mysql-stop_cmd=pkill mysqld -spam-start:VPservice -u: - $P spamd -d - service -U $target -spam-stop_cmd=pkill spamd +spamd-start_cmd=spamd -u spamd -d +spamd-stop_cmd=pkill spamd tor-start:VPservice -u: $P exec tor & diff --git a/src/initctld.c b/src/initctld.c index 892a25e..7391ec4 100644 --- a/src/initctld.c +++ b/src/initctld.c @@ -132,12 +132,12 @@ void process_request(struct init_request *request) break; case INIT_CMD_SETENV: printf("eval export %.*s\n", - sizeof(request->i.data), + (int)sizeof(request->i.data), request->i.data); break; case INIT_CMD_CHANGECONS: printf("changeconsole %.*s\n", - sizeof(request->i.bsd.reserved), + (int)sizeof(request->i.bsd.reserved), request->i.bsd.reserved); break; default: diff --git a/src/mkinit b/src/mkinit index 4d8c589..4b39890 100755 --- a/src/mkinit +++ b/src/mkinit @@ -72,7 +72,7 @@ function runamk { export MKINIT_STATE=/tmp/mkinit_state mkdir -p $MKINIT_STATE fi - /usr/lib/plan9/bin/mk \ + /opt/plan9/bin/mk \ -f /etc/init.mk \ -i -k "$@" } diff --git a/src/mkinit.rc b/src/mkinit.rc index 2a43fd0..14b83cc 100755 --- a/src/mkinit.rc +++ b/src/mkinit.rc @@ -1,4 +1,4 @@ -#!/usr/lib/plan9/bin/rc +#!/opt/plan9/bin/rc # Copyright (C) 2009 Andy Spencer # See ../COPYING for terms @@ -78,7 +78,7 @@ fn runamk { MKINIT_STATE=/tmp/mkinit_state mkdir -p $MKINIT_STATE } - /usr/lib/plan9/bin/mk \ + /opt/plan9/bin/mk \ -f /etc/init.mk \ -i -k $* } diff --git a/src/respawn b/src/respawn index d41ff63..ba2b4ca 100755 --- a/src/respawn +++ b/src/respawn @@ -1,4 +1,4 @@ -#!/usr/lib/plan9/bin/rc +#!/opt/plan9/bin/rc # Copyright (C) 2009 Andy Spencer # See ../COPYING for terms diff --git a/src/service b/src/service index 97280b3..67dd734 100755 --- a/src/service +++ b/src/service @@ -1,4 +1,4 @@ -#!/usr/lib/plan9/bin/rc +#!/opt/plan9/bin/rc # Copyright (C) 2009 Andy Spencer # See ../COPYING for terms -- 2.43.2