initscripts: Reflect changes on latest udev and upstart versions.

Squashed commit of the following:

commit 540d1b2b875c437ba6114267b89e1af1de4bd616
Author: Schantl Stefan <Stevee@ipfire.org>
Date:   Fri Jun 4 23:53:37 2010 +0200

    initscripts: Add commit to udev jobfile.

commit 13a27c6057470e980828ebbe771b39f1073b5d5e
Author: Schantl Stefan <Stevee@ipfire.org>
Date:   Fri Jun 4 23:45:18 2010 +0200

    initscripts: Udev start on startup and clean up jobfile to use new udev functions.

commit 358d0a7db1bbfad9c1c1eca516d6752c1507dce5
Author: Schantl Stefan <Stevee@ipfire.org>
Date:   Fri Jun 4 23:43:52 2010 +0200

    initscripts: Swith stating goals of load-modules and sysctl.

commit bfd6768c717aef07b655e69b7869d69a86c31837
Author: Schantl Stefan <Stevee@ipfire.org>
Date:   Fri Jun 4 23:40:32 2010 +0200

    initscripts: Remove unneeded file mount-kernel-filesystems.

diff --git a/pkgs/core/initscripts/init/load-modules.conf b/pkgs/core/initscripts/init/load-modules.conf
index b64658c389ed038e06e446562686ecc02bda1b27..d9cc718b265cff0225d52812e172c6a1b261d826 100644 (file)
--- a/pkgs/core/initscripts/init/load-modules.conf
+++ b/pkgs/core/initscripts/init/load-modules.conf
@@ -1,7 +1,7 @@
 description            "Trigger coldplug events"
 author                 "IPFire Team"
 
-start on stopped mount-kernel-filesystems
+start on startup
 
 script
        # Exit if there's no modules file or there are no

diff --git a/pkgs/core/initscripts/init/mount-kernel-filesystems.conf b/pkgs/core/initscripts/init/mount-kernel-filesystems.conf
deleted file mode 100644 (file)
index cef79e5..0000000
--- a/pkgs/core/initscripts/init/mount-kernel-filesystems.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-description            "Mount kernel virtual systems"
-author                 "IPFire Team"
-
-start on stopped welcome
-
-script
-       if ! mountpoint /proc > /dev/null; then
-               mount -n /proc || failed=1
-       fi
-
-       if ! mountpoint /sys > /dev/null; then
-               mount -n /sys || failed=1
-       fi
-
-       exit ${failed}
-end script

diff --git a/pkgs/core/initscripts/init/sysctl.conf b/pkgs/core/initscripts/init/sysctl.conf
index 2289a9a91c642c6e59c0f24b2cc4760c35d961d9..7293c3bf1eb319bbbe1d80050e6a237bd125d084 100644 (file)
--- a/pkgs/core/initscripts/init/sysctl.conf
+++ b/pkgs/core/initscripts/init/sysctl.conf
@@ -1,7 +1,7 @@
 description            "Set sysctl settings"
 author                 "IPFire Team"
 
-start on stopped mount-kernel-filesystems
+start on startup
 
 script
     if [ -f "/etc/sysctl.conf" ]; then

diff --git a/pkgs/core/initscripts/init/udev.conf b/pkgs/core/initscripts/init/udev.conf
index 421b8d043a3e82a28b164775bfe726f13905f347..469f46a2b273514014518fa78db348bbbf53e1e5 100644 (file)
--- a/pkgs/core/initscripts/init/udev.conf
+++ b/pkgs/core/initscripts/init/udev.conf
@@ -1,21 +1,20 @@
 description            "Start Udev Daemon"
 author                 "IPFire Team"
 
-start on stopped mount-kernel-filesystems
-stop on starting shutdown or starting reboot
+start on startup
+stop on shutdown or reboot
 
 console output
 
-pre-start script
+# xxx should be a pre-start script but it only works as script - 
+# I don't know why...
+
+script
        # Mount a temporary file system over /dev, so that any devices
        # made or removed during this boot don't affect the next one.
        # The reason we don't write to mtab is because we don't ever
        # want /dev to be unavailable (such as by `umount -a').
        mount -n -t tmpfs tmpfs /dev -o mode=755
-
-       # Udev handles uevents itself, so we don't need to have
-       # the kernel call out to any binary in response to them
-       echo > /proc/sys/kernel/hotplug
 end script
 
 expect fork