Update mkinit

- Change /usr/lib/plan9 prefix to /opt/plan9
- Update bitlbee rule for bitlbee 3.0
- Cleanup spamassassin rule

diff --git a/init.mk b/init.mk
index 81c14870fc1cce24ad4af6decde04af800cc39b8..3c1b0224b975dc1574026158c88b5771a91877f8 100644 (file)
--- a/init.mk
+++ b/init.mk
@@ -2,7 +2,7 @@
 # See COPYING for terms
 
 # Config
 # See COPYING for terms
 
 # Config

-MKSHELL=/usr/lib/plan9/bin/rc
+MKSHELL=/opt/plan9/bin/rc

 NPROC=10
 
 hostname-opts = c
 NPROC=10
 
 hostname-opts = c

diff --git a/services.mk b/services.mk
index 0938103b39a42830e5088e75d7024d7b303c22ca..54f7ea5835ed0d4039287e2e5cce2ca6b49ee403 100644 (file)
--- 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
 
 # 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
 
 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
        $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
 
        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 &
 
 tor-start:VPservice -u:
        $P exec tor &

diff --git a/src/initctld.c b/src/initctld.c
index 892a25e623cf0025e5e77811306c734cc12a6953..7391ec4dd18efc5b751d901763831f839e568c64 100644 (file)
--- 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",
                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",
                                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:
                                request->i.bsd.reserved);
                break;
        default:

diff --git a/src/mkinit b/src/mkinit
index 4d8c5899351c254a3ead31b614a5603ef8c2b3b2..4b39890ce4bb3f6be0adac0eadc9e731b6888ef3 100755 (executable)
--- a/src/mkinit
+++ b/src/mkinit
@@ -72,7 +72,7 @@ function runamk {
                export MKINIT_STATE=/tmp/mkinit_state
                mkdir -p $MKINIT_STATE
        fi
                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 "$@"
 }
                -f /etc/init.mk \
                -i -k "$@"
 }

diff --git a/src/mkinit.rc b/src/mkinit.rc
index 2a43fd0ed1fee1259ab7afdd47f36a40662213e1..14b83cce243dbd1445f070488f11ca240207b976 100755 (executable)
--- 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
 
 # Copyright (C) 2009 Andy Spencer
 # See ../COPYING for terms


@@ -78,7 +78,7 @@ fn runamk {
                MKINIT_STATE=/tmp/mkinit_state
                mkdir -p $MKINIT_STATE
        }
                MKINIT_STATE=/tmp/mkinit_state
                mkdir -p $MKINIT_STATE
        }

-       /usr/lib/plan9/bin/mk \
+       /opt/plan9/bin/mk \

                -f /etc/init.mk \
                -i -k $*
 }
                -f /etc/init.mk \
                -i -k $*
 }

diff --git a/src/respawn b/src/respawn
index d41ff631388c2daf172c206c30fc7f2e4378fb69..ba2b4ca32ef7ad799e8f074cca1b9169c4c622e3 100755 (executable)
--- 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
 
 # Copyright (C) 2009 Andy Spencer
 # See ../COPYING for terms

diff --git a/src/service b/src/service
index 97280b39f18b252af9629e1ae8244e1a799b7d48..67dd734adaddc540c20040369e88875dfd3f55c4 100755 (executable)
--- 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
 
 # Copyright (C) 2009 Andy Spencer
 # See ../COPYING for terms