Source Mage code commit list

[Arwed von Merkatz <scm AT sourcemage.org>]

GIT changes to stable-0.13 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

 disk/udev/DETAILS         |    1 +
 disk/udev/HISTORY         |    5 +++++
 disk/udev/init.d/coldplug |   13 ++++++++-----
 3 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 38d4280ccf06d4038d75ce7116bff25b64580d21
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    udev: only run coldplugging if udev is used

diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index c23576e..172cf1b 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,6 @@
            SPELL=udev
          VERSION=113
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 40a63ca..7da84a7 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,8 @@
+2007-08-26 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * init.d/coldplug: only run the coldplugging stuff if udev is used for
+         /dev management, bug #13807
+       * DETAILS: PATCHLEVEL++
+
 2007-06-25 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 113
 
diff --git a/disk/udev/init.d/coldplug b/disk/udev/init.d/coldplug
index 66ca154..aee9a67 100755
--- a/disk/udev/init.d/coldplug
+++ b/disk/udev/init.d/coldplug
@@ -7,14 +7,17 @@ NEEDS="udevd"
 
 # source function library
 . /etc/init.d/smgl_init
+. /etc/sysconfig/devices
 
 start() 
 {
-  echo "Triggering kernel device uevents..."
-  /sbin/udevtrigger
-  evaluate_retval
-  echo "Waiting for all events to be handled..."
-  /sbin/udevsettle --timeout=60
+  if [[ $DEVICES = udev ]]; then
+    echo "Triggering kernel device uevents..."
+    /sbin/udevtrigger
+    evaluate_retval
+    echo "Waiting for all events to be handled..."
+    /sbin/udevsettle --timeout=60
+  fi
   evaluate_retval
 }