Misc updates

[mkinit] / init.mk

diff --git a/init.mk b/init.mk
index 3c1b0224b975dc1574026158c88b5771a91877f8..cf939fc6f0271bc8649af564de94d01bf14b9c41 100644 (file)
--- a/init.mk
+++ b/init.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2010 Andy Spencer
+# Copyright (C) 2009-2011 Andy Spencer
 # See COPYING for terms
 
 # Config
@@ -11,10 +11,10 @@ apache2-opts  = -DSSL -DPHP5
 # Runlevels:
 #   single─bare─system─┬─desktop─>
 #                      └─server──>
-server  = apache2 courier dhcp mysql spamd tor
-desktop = alsa cups dbus getty qingy keymap polipo
-system  = at cron hddtemp hwclock sshd swap syslog
-bare    = cpufreq fsclean hostname initctl localhost modules mounts uevents utmp
+server  = apache2 bitlbee dhcp dovecot exim gitd mysql ntpd spamd
+desktop = alsa dhcp getty gpm keymap qingy
+system  = at cron hddtemp hwclock sshd swap sysctl syslog
+bare    = cpufreq fsclean hostname initctl localhost mdev modules mounts utmp
 
 default:V: desktop
 
@@ -25,4 +25,4 @@ bare:V:    `{echo $server^-stop  $desktop^-stop  $system^-stop  $bare^-start}
 single:V:  `{echo $server^-stop  $desktop^-stop  $system^-stop  $bare^-stop }
 
 # Include services
-</scratch/lug/mkinit/init.mk
+</etc/services.mk