X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=services.mk;h=a0f3fbf7bc2c1cfd7be696b7366289015324d5cd;hb=9833b11dfa98fba16ac28f980b9fa9be997e9003;hp=d20f27ae2a908d6233ff36f3bab5071b12aa5071;hpb=7ced3b64e38003798ec467e1167a94a60c7b330a;p=mkinit

diff --git a/services.mk b/services.mk
index d20f27a..a0f3fbf 100644
--- a/services.mk
+++ b/services.mk
@@ -17,7 +17,8 @@ poweroff:V: halt
 reboot:V: halt
 	$P reboot -ndf
 kexec:V: halt
-	$P reboot -ndfk
+	$P kexec -l /usr/src/linux/arch/x86/boot/bzImage --reuse-cmdline
+	$P kexec -e
 
 # Initial setup/shutdown for mkinit
 boot:VEPservice -u: /
@@ -164,6 +165,12 @@ hddtemp-stop_cmd=pkill hddtemp
 hwclock-start_cmd=hwclock --hctosys --utc
 hwclock-stop_cmd=hwclock --systohc --utc
 
+mdadm-start_cmd=mdadm --monitor --scan --daemonize
+mdadm-stop_cmd=pkill mdadm
+
+smartd-start_cmd=smartd
+smartd-stop_cmd=pkill smartd
+
 sshd-start_cmd=/usr/sbin/sshd
 sshd-stop_cmd=pkill sshd
 
@@ -208,13 +215,17 @@ polipo-stop_cmd=pkill polipo
 # ------
 apache2-start:VPservice -u: fsclean-start
 	$P install -o apache -g apache -d /var/run/session
-	$P apache2 $apache2-opts
+	$P apache2 $(apache2-opts)
+	service -U $target
 apache2-stop_cmd=pkill apache2
 
 #bitlbee-start_cmd=sudo -u bitlbee bitlbeed /usr/sbin/bitlbee
 bitlbee-start_cmd=bitlbee -D -u bitlbee
 bitlbee-stop_cmd=pkill bitlbee
 
+cups-start_cmd=cupsd
+cups-stop_cmd=pkill cupsd
+
 denyhosts-start_cmd=denyhosts.py --daemon
 denyhosts-stop_cmd=pkill denyhosts.py
 
@@ -262,6 +273,9 @@ gitd-start:VPservice -u: boot
 	service -U $target
 gitd-stop_cmd=pkill git-daemon
 
+jabberd-start_cmd=sudo -u jabber -g jabber jabberd -b
+jabberd-stop_cmd=pkill --uid jabber
+
 mailman-start_cmd=sudo -u mailman -g mailman \
 	/usr/lib64/mailman/bin/mailmanctl -s start
 mailman-stop_cmd=sudo -u mailman -g mailman \