Misc updates

Add gpm, devtmpfs, and mdev rules
Some a few other rules

diff --git a/mkfile b/mkfile
index 8a60b60fb48a1e4667a059840eb1c668164d883e..b332d0279a6b617cc0334f6b52b3959ab8f6ed26 100644 (file)
--- a/mkfile
+++ b/mkfile
@@ -14,7 +14,7 @@ install:V: all
                $DESTDIR/lib/mkinit/state
        install -t $DESTDIR/lib/mkinit/bin \
                ./src/{mkinit,service,respawn,initctld}
-       install -t $DESTDIR/etc  ./init.mk       
+       #install -t $DESTDIR/etc  ./init.mk       
        ln -sf $DESTDIR/lib/mkinit/bin/mkinit $DESTDIR/sbin
 
 uninstall:VE:

diff --git a/services.mk b/services.mk
index 5f08d81bdf4bc7cb547b092a30f72d64d6894ed8..dde559bcecb064b301f2aa43007ab7a0d2a4bcb5 100644 (file)
--- a/services.mk
+++ b/services.mk
@@ -63,10 +63,17 @@ mounts-start:VPservice -u: boot
        $P mount -a
        service -U $target
 
-# Load kernel modules
-modules-start:VEPservice -u: boot
-       $P modprobe uvesafb
-       $P modprobe evdev
+# 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
 
 # Start udev and trigger events
@@ -75,6 +82,13 @@ udev-start:VEPservice -u:  mounts-start
        $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
@@ -94,14 +108,14 @@ getty-start:VEPservice -u: hostname-start utmp-start
        $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[2]
 qingy-start:VEPservice -u: hostname-start utmp-start modules-start
        $P respawn /sbin/qingy tty2
        $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
@@ -114,7 +128,7 @@ utmp-start:VPservice -u: fsclean-start
 utmp-stop_cmd=halt -w
 
 # CPU freq
-cpufreq-start:VPservice -u: boot
+cpufreq-start:VPservice -u: mounts-start
        $P cpufreq-set -g ondemand
        service -U $target
 
@@ -171,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
@@ -206,6 +223,9 @@ mysql-start:VPservice -u: fsclean-start
        service -U $target
 mysql-stop_cmd=pkill mysqld
 
+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
 
@@ -214,9 +234,6 @@ tor-start:VPservice -u: boot
        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