X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=init.mk;fp=init.mk;h=eeeda2152e2cbab28ad720e18817fd56e1dd16db;hb=3928288d9e80e2ff76e7e5d83678b92c4d275c3c;hp=710acddb23622b809e0128c8469620c0d11eb2ff;hpb=8a60f9061f543da819b863ed5fb009a4dbea7de0;p=mkinit

diff --git a/init.mk b/init.mk
index 710acdd..eeeda21 100644
--- a/init.mk
+++ b/init.mk
@@ -4,7 +4,7 @@
 # Config
 PATH=/lib/mkinit/bin:/bin:/sbin:/usr/bin:/usr/sbin
 MKSHELL=/usr/lib/plan9/bin/rc
-NPROC=8
+NPROC=10
 
 # Example
 #start-test:VQPservice -u: start-foo
@@ -16,21 +16,24 @@ NPROC=8
 #	service -D $target
 
 # Runlevels
-default:V: bare
+# Make getty wait (for bootchart)
+default:V: user
 
-desktop:V: console `{echo start-^(alsa polipo spam sshd)}
-console:V: bare    `{echo start-^(at cron syslog hddtemp i8k hwclock swap)}
-bare:V:            `{echo start-^(mounts uevents hostname fsclean getty qingy localhost keymap)}
+user:V:   system `{echo start-^(alsa keymap polipo spam)}
+system:V: bare   `{echo start-^(at cron hddtemp hostname hwclock i8k sshd swap syslog)}
+bare:V:          `{echo start-^(cpufreq fsclean getty localhost modules mounts uevents)}
 
 # Initial setup/shutdown for mkinit
 boot:QVEPservice -u: /
 	echo Starting init
 	$P mount -o remount,rw /
+	# mount proc here to make bootchart happier
+	$P mount -t proc proc /proc
 	rm -f /lib/mkinit/state/*
 	service -U $target
 
 # Kill all process, then remount and sync
-halt:QVE: stop-hwclock stop-alsa
+halt:QVE: stop-utmp stop-hwclock stop-alsa
 	echo Stopping init
 	rm -f /lib/mkinit/state/*
 	
@@ -50,7 +53,6 @@ halt:QVE: stop-hwclock stop-alsa
 # Proc, mtab, udev, fstab
 start-mounts:QVPservice -u: boot
 	echo Starting mounts
-	$P mount -t proc proc /proc
 	$P cat /proc/mounts > /etc/mtab
 	$P udevd --daemon
 	$P mount -a 
@@ -77,7 +79,7 @@ start-fsclean:QVPservice -u: boot
 	service -U $target
 
 # Spawn gettys for tty[456]
-start-getty:QVPservice -u: start-hostname
+start-getty:QVPservice -u: start-hostname start-utmp
 	echo Starting getty
 	$P respawn /sbin/agetty 38400 tty4 linux &
 	$P respawn /sbin/agetty 38400 tty5 linux &
@@ -85,12 +87,29 @@ start-getty:QVPservice -u: start-hostname
 	service -U $target
 
 # Spawn qingys for tty[23]
-start-qingy:QVPservice -u: start-hostname start-modules start-uevents
+start-qingy:QVPservice -u: start-hostname start-utmp start-modules start-uevents
 	echo Starting qingy
 	$P respawn /sbin/qingy tty2 &
 	$P respawn /sbin/qingy tty3 &
 	service -U $target
 
+# Login records
+start-utmp:QVPservice -u: start-fsclean
+	echo Starting utmp
+	for (i in /var/run/utmp /var/log/wtmp) {
+		echo -n > $i
+		chgrp utmp $i
+		chmod 0664 $i
+	}
+	service -U $target
+utmp_stop_cmd=halt -w
+
+# CPU freq
+start-cpufreq:QVPservice -u: start-uevents
+	echo Starting cpufreq
+	cpufreq-set -g ondemand
+	service -U $target
+
 # Keymap (us-cc = us with ctrl-capslock switched)
 keymap_start_cmd=loadkeys -u us-cc