Misc updates

[mkinit] / services.mk

diff --git a/services.mk b/services.mk
index 0938103b39a42830e5088e75d7024d7b303c22ca..75a2b125d1430101d9615bb0b3924f62a3ddf9f6 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
@@ -57,49 +57,65 @@ initctl-start:VPservice -u: boot
        service -U $target
 initctl-stop_cmd=fuser -k /dev/initctl
 
-# Proc, mtab, udev, fstab
+# Proc, mtab, fstab
 mounts-start:VPservice -u: boot
        $P cp /proc/mounts /etc/mtab
-       $P udevd --daemon
        $P mount -a
        service -U $target
 
-# Load kernel modules
-modules-start:VEPservice -u: boot
-       $P modprobe uvesafb
+# Mount devtmpfs and shm/pts subfolders
+devtmpfs-start:VEPservice -u: boot
+       $P mount /dev
+       $P mkdir /dev/shm
+       $P mkdir /dev/pts
+       service -U $target
+
+# Start mdev as initial/daemon
+mdev-start:VEPservice -u: mounts-start udev-stop
+       $P echo /sbin/mdev > /proc/sys/kernel/hotplug
+       $P mdev -s
        service -U $target
 
-# Trigger udev uevents
-uevents-start:VEPservice -u:  mounts-start
+# Start udev and trigger events
+udev-start:VEPservice -u:  mounts-start
+       $P udevd --daemon
        $P udevadm trigger
        $P udevadm settle '--timeout=10'
        service -U $target
+udev-stop_cmd=pkill udevd
+
+# Load kernel modules
+modules-start:VEPservice -u: boot
+       $P modprobe uvesafb
+       $P modprobe evdev
+       service -U $target
 
 # Clean out /tmp and /var/run directories
 fsclean-start:VPservice -u: boot
        dirs=(/var/run /tmp)
        $P mkdir -p /.old
-       $P mv $dirs /.old
+       $P mv $dirs /.old || true
        $P mkdir -p $dirs
        $P chmod 1777 /tmp
-       $P install -m 1777 -d /var/run/screen # Fuck you Screen
+       $P install -m 777 -d /var/run/screen # Fuck you Screen
        $P exec rm -rf /.old &
        service -U $target
 
-# Spawn gettys for tty[456]
+# Spawn gettys for tty[3456]
 getty-start:VEPservice -u: hostname-start utmp-start
+       $P respawn /sbin/agetty 38400 tty3 linux
        $P respawn /sbin/agetty 38400 tty4 linux
        $P respawn /sbin/agetty 38400 tty5 linux
        $P respawn /sbin/agetty 38400 tty6 linux
        service -U $target
-getty-stop_cmd=fuser -k /dev/tty4 /dev/tty5 /dev/tty6
+getty-stop_cmd=fuser -k /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6
 
-# Spawn qingys for tty[23]
-qingy-start:VEPservice -u: hostname-start utmp-start modules-start uevents-start
+# Spawn qingys for tty[2]
+qingy-start:VEPservice -u: hostname-start utmp-start modules-start
        $P respawn /sbin/qingy tty2
-       $P respawn /sbin/qingy tty3
+       $P chvt 2
        service -U $target
-qingy-stop_cmd=fuser -k /dev/tty2 /dev/tty3
+qingy-stop_cmd=fuser -k /dev/tty2
 
 # Login records
 utmp-start:VPservice -u: fsclean-start
@@ -112,7 +128,7 @@ utmp-start:VPservice -u: fsclean-start
 utmp-stop_cmd=halt -w
 
 # CPU freq
-cpufreq-start:VPservice -u: uevents-start
+cpufreq-start:VPservice -u: mounts-start
        $P cpufreq-set -g ondemand
        service -U $target
 
@@ -169,6 +185,9 @@ dbus-start:VPservice -u: fsclean-start localhost-start
        service -U $target
 dbus-stop_cmd=pkill dbus-daemon
 
+gpm-start_cmd=gpm -m /dev/input/mice -t ps2
+gpm-stop_cmd=pkill gpm
+
 keymap-start_cmd=loadkeys -u us-cc
 
 polipo-start:VPservice -u: localhost-start
@@ -182,7 +201,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
@@ -194,25 +217,44 @@ courier-stop_cmd=pkill '(courier|authdaemon)'
 dhcp-start_cmd=dhcpcd eth0
 dhcp-stop_cmd=dhcpcd eth0 -k
 
+dovecot-start_cmd=dovecot
+dovecot-stop_cmd=pkill dovecot
+
+exim-start_cmd=exim -q5m
+exim-stop_cmd=pkill exim
+
+gitd-start:VPservice -u: boot
+       $P exec /usr/libexec/git-core/git-daemon \
+               '--syslog' \
+               '--export-all' \
+               '--user-path=git' \
+               '--base-path=/home/server/git' \
+               '--listen=0.0.0.0' \
+               '--user=nobody' \
+               '--group=nobody' &
+       service -U $target
+gitd-stop_cmd=pkill git-daemon
+
 mysql-start:VPservice -u: fsclean-start
        $P install -o mysql -g mysql -d /var/run/mysqld
-       $P mysqld &
+       $P exec mysqld &
        service -U $target
 mysql-stop_cmd=pkill mysqld
 
-spam-start:VPservice -u:
-       $P spamd -d
-       service -U $target
-spam-stop_cmd=pkill spamd
+ntpd-start_cmd=ntpd
+ntpd-stop_cmd=pkill ntpd
+
+privoxy-start_cmd=privoxy --user privoxy.privoxy /etc/privoxy/config
+privoxy-stop_cmd=pkill privoxy
+
+spamd-start_cmd=spamd -u spamd -d
+spamd-stop_cmd=pkill spamd
 
-tor-start:VPservice -u:
+tor-start:VPservice -u: boot
        $P exec tor &
        service -U $target
 tor-stop_cmd=pkill tor
 
-privoxy-start_cmd=privoxy --user privoxy.privoxy /etc/privoxy/config
-privoxy-stop_cmd=pkill privoxy
-
 # Library 
 # -------
 %-start:QVPservice -u: boot