X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=services.mk;h=3f69b57d1db4d948f5110db79fdc9bda18ca0478;hb=649d174c683416c1579e7324614c266d3853a20f;hp=3e915001e563f206bafb72a9c7394e1b2397d787;hpb=9ea0619a473c0e3afb05d68377cd6fda9c634063;p=mkinit

diff --git a/services.mk b/services.mk
index 3e91500..3f69b57 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: /
@@ -101,15 +102,21 @@ fsclean-start:VPservice -u: boot
 	$P exec rm -rf /.old &
 	service -U $target
 
-# Spawn gettys for tty[23456]
-getty-start:VEPservice -u: hostname-start utmp-start
+# Spawn gettyd for tty[23456]
+gettyd-start:VEPservice -u: hostname-start utmp-start
+	$P exec gettyd tty2 tty3 tty4 tty5 tty6 &
+	service -U $target
+gettyd-stop_cmd=fuser -k /dev/tty2 /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6
+
+# Spawn agettys for tty[23456]
+agetty-start:VEPservice -u: hostname-start utmp-start
 	$P respawn setsid agetty 38400 tty2 linux
 	$P respawn setsid agetty 38400 tty3 linux
 	$P respawn setsid agetty 38400 tty4 linux
 	$P respawn setsid agetty 38400 tty5 linux
 	$P respawn setsid agetty 38400 tty6 linux
 	service -U $target
-getty-stop_cmd=fuser -k /dev/tty2 /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6
+agetty-stop_cmd=fuser -k /dev/tty2 /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6
 
 # Spawn qingys for tty[7]
 qingy-start:VEPservice -u: hostname-start utmp-start modules-start
@@ -153,7 +160,9 @@ sysctl-start:VPservice -u: mounts-start
 at-start_cmd=atd
 at-stop_cmd=pkill atd
 
-cron-start_cmd=cron
+cron-start:VPservice -u: localhost-start fsclean-start
+	$P cron
+	service -U $target
 cron-stop_cmd=pkill cron
 
 hddtemp-start_cmd=hddtemp -d
@@ -162,6 +171,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
 
@@ -206,13 +221,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
 
@@ -260,12 +279,15 @@ 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 \
 	/usr/lib64/mailman/bin/mailmanctl stop
 
-munged-start:VPservice -u: boot
+munged-start:VPservice -u: localhost-start mounts-start
 	$P install -o munge -g munge -d /var/run/munge
 	$P sudo -u munge -g munge munged
 	service -U $target