Add entry in fstab and let the mount system call start devman.

After this commit you will need an additional entry in fstab for
the /sys file system (see docs/UPDATING).

diff --git a/commands/setup/setup.sh b/commands/setup/setup.sh
index 1e50a64a8f3a920d98e4bfd7b611db79614745a4..382b2077d9ac5fe2a37f951d7701598bdd491c57 100644 (file)
--- a/commands/setup/setup.sh
+++ b/commands/setup/setup.sh
@@ -697,7 +697,7 @@ mkfs.$FSTYPE -B $blocksizebytes /dev/$usr || exit
 
 if [ "$nohome" = 0 ]
 then
-       fshome="/dev/$home      /home   $FSTYPE rw      0       2"
+       fshome="/dev/$home      /home   $FSTYPE rw                      0       2"
 else   fshome=""
 fi
 
@@ -731,9 +731,10 @@ ln -s /usr/log /mnt/var/log
 
 # CD remnants that aren't for the installed system
 rm /mnt/etc/issue /mnt/CD /mnt/.* 2>/dev/null
-echo >/mnt/etc/fstab "/dev/$root       /       mfs     rw      0       1
-/dev/$usr      /usr    $FSTYPE rw      0       2
-$fshome"
+echo >/mnt/etc/fstab "/dev/$root       /       mfs     rw                      0       1
+/dev/$usr      /usr    $FSTYPE rw                      0       2
+$fshome
+none           /sys    devman  rw,rslabel=devman       0       0"
 
                                        # National keyboard map.
 test -n "$keymap" && cp -p "/usr/lib/keymaps/$keymap.map" /mnt/etc/keymap

diff --git a/docs/UPDATING b/docs/UPDATING
index 337a40c647a0c94f7e0577abc02e4be7d1318c80..bec381629d502b75eb10c869ef4c8de51140c865 100644 (file)
--- a/docs/UPDATING
+++ b/docs/UPDATING
@@ -1,3 +1,12 @@
+20120703:
+       The device manager(devman) is now started automatically during the 
+       mount -a operation.  As fstab is generated during installation it is 
+       required to manually insert the following entry in fstab. Failing to 
+       do so will result in the devmand daemon to be able to open the events 
+       file in /sys.
+
+       none  /sys  devman  rw,rslabel=devman 0 0
+
 20120608:
        New install and mk files require the following steps:
 

diff --git a/etc/rc b/etc/rc
index 099ed966d6aba27d56db4911045287fefcf601d8..3900c9abdc28bd70f5ca763d30261495935fc95c 100755 (executable)
--- a/etc/rc
+++ b/etc/rc
@@ -188,9 +188,6 @@ start)
     esac
 
     echo -n "Starting hotplugging infrastructure... "
-    service up /sbin/devman
-    mount -e -t devman none /sys
-    rm -f /var/tmp/devmand_control
     rm -f /var/run/devmand.pid
     devmand -d /etc/devmand -d /usr/pkg/etc/devmand &
     echo "done."
@@ -216,8 +213,6 @@ down|stop)
     then 
        /usr/pkg/etc/rc.d/usbd stop
     fi
-    umount -e /sys
-    service down devman
     # Tell RS server we're going down.
     service shutdown
     ;;