Initscripts: add udev guard to all devices scripts

diff --git a/packages/initscripts/initscripts-1.0/akita/devices b/packages/initscripts/initscripts-1.0/akita/devices
index b3a3323b8a2db4e92aa71302d6bebb43f37fefed..083090ecb9f972621b25d8233bc48911fc594e6e 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/akita/devices
+++ b/packages/initscripts/initscripts-1.0/akita/devices
@@ -5,6 +5,11 @@
 
 . /etc/default/rcS
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
 if test -e /dev/.devfsd
 then
        if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi

diff --git a/packages/initscripts/initscripts-1.0/beagle/devices b/packages/initscripts/initscripts-1.0/beagle/devices
index f80b7f9edb00cbc598e024413647ecd0e0f15177..04fffbac102ee8dde691f925eab5349551acd3d4 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/beagle/devices
+++ b/packages/initscripts/initscripts-1.0/beagle/devices
@@ -5,6 +5,11 @@
 
 . /etc/default/rcS
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
 if test -e /dev/.devfsd
 then
        if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi

diff --git a/packages/initscripts/initscripts-1.0/c7x0/devices b/packages/initscripts/initscripts-1.0/c7x0/devices
index b3a3323b8a2db4e92aa71302d6bebb43f37fefed..083090ecb9f972621b25d8233bc48911fc594e6e 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/c7x0/devices
+++ b/packages/initscripts/initscripts-1.0/c7x0/devices
@@ -5,6 +5,11 @@
 
 . /etc/default/rcS
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
 if test -e /dev/.devfsd
 then
        if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi

diff --git a/packages/initscripts/initscripts-1.0/collie/devices b/packages/initscripts/initscripts-1.0/collie/devices
index 7413e455b0ce36dc944bc23a2109630297ce50b5..9d1624428a0d53c8420619a87391b5415a98442c 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/collie/devices
+++ b/packages/initscripts/initscripts-1.0/collie/devices
@@ -5,6 +5,11 @@
 
 . /etc/default/rcS
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
 if test -e /dev/.devfsd
 then
        if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi

diff --git a/packages/initscripts/initscripts-1.0/h3600/devices b/packages/initscripts/initscripts-1.0/h3600/devices
index d7b346a655f88f11639c1df8ea7bb1b29ef7c1c0..0e59229225e6d2a46b263dbf5a92afd3c9e24c13 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/h3600/devices
+++ b/packages/initscripts/initscripts-1.0/h3600/devices
@@ -3,6 +3,11 @@
 # Devfs handling script.  Since we arent running devfsd due to various reasons
 # which I will not lay out here, we need to create some links for compatibility.
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
     test -n "$VERBOSE" && echo -n "Setting up device links for devfs: "
     (
     ln -s /dev/vc/0 /dev/tty0

diff --git a/packages/initscripts/initscripts-1.0/h3900/devices b/packages/initscripts/initscripts-1.0/h3900/devices
index d7b346a655f88f11639c1df8ea7bb1b29ef7c1c0..0e59229225e6d2a46b263dbf5a92afd3c9e24c13 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/h3900/devices
+++ b/packages/initscripts/initscripts-1.0/h3900/devices
@@ -3,6 +3,11 @@
 # Devfs handling script.  Since we arent running devfsd due to various reasons
 # which I will not lay out here, we need to create some links for compatibility.
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
     test -n "$VERBOSE" && echo -n "Setting up device links for devfs: "
     (
     ln -s /dev/vc/0 /dev/tty0

diff --git a/packages/initscripts/initscripts-1.0/jornada56x/devices b/packages/initscripts/initscripts-1.0/jornada56x/devices
index d7b346a655f88f11639c1df8ea7bb1b29ef7c1c0..0e59229225e6d2a46b263dbf5a92afd3c9e24c13 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/jornada56x/devices
+++ b/packages/initscripts/initscripts-1.0/jornada56x/devices
@@ -3,6 +3,11 @@
 # Devfs handling script.  Since we arent running devfsd due to various reasons
 # which I will not lay out here, we need to create some links for compatibility.
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
     test -n "$VERBOSE" && echo -n "Setting up device links for devfs: "
     (
     ln -s /dev/vc/0 /dev/tty0

diff --git a/packages/initscripts/initscripts-1.0/jornada7xx/devices b/packages/initscripts/initscripts-1.0/jornada7xx/devices
index d7b346a655f88f11639c1df8ea7bb1b29ef7c1c0..0e59229225e6d2a46b263dbf5a92afd3c9e24c13 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/jornada7xx/devices
+++ b/packages/initscripts/initscripts-1.0/jornada7xx/devices
@@ -3,6 +3,11 @@
 # Devfs handling script.  Since we arent running devfsd due to various reasons
 # which I will not lay out here, we need to create some links for compatibility.
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
     test -n "$VERBOSE" && echo -n "Setting up device links for devfs: "
     (
     ln -s /dev/vc/0 /dev/tty0

diff --git a/packages/initscripts/initscripts-1.0/poodle/devices b/packages/initscripts/initscripts-1.0/poodle/devices
index 7413e455b0ce36dc944bc23a2109630297ce50b5..9d1624428a0d53c8420619a87391b5415a98442c 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/poodle/devices
+++ b/packages/initscripts/initscripts-1.0/poodle/devices
@@ -5,6 +5,11 @@
 
 . /etc/default/rcS
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
 if test -e /dev/.devfsd
 then
        if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi

diff --git a/packages/initscripts/initscripts-1.0/simpad/devices b/packages/initscripts/initscripts-1.0/simpad/devices
index d7b346a655f88f11639c1df8ea7bb1b29ef7c1c0..0e59229225e6d2a46b263dbf5a92afd3c9e24c13 100644 (file)
--- a/packages/initscripts/initscripts-1.0/simpad/devices
+++ b/packages/initscripts/initscripts-1.0/simpad/devices
@@ -3,6 +3,11 @@
 # Devfs handling script.  Since we arent running devfsd due to various reasons
 # which I will not lay out here, we need to create some links for compatibility.
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
     test -n "$VERBOSE" && echo -n "Setting up device links for devfs: "
     (
     ln -s /dev/vc/0 /dev/tty0

diff --git a/packages/initscripts/initscripts-1.0/spitz/devices b/packages/initscripts/initscripts-1.0/spitz/devices
index b3a3323b8a2db4e92aa71302d6bebb43f37fefed..083090ecb9f972621b25d8233bc48911fc594e6e 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/spitz/devices
+++ b/packages/initscripts/initscripts-1.0/spitz/devices
@@ -5,6 +5,11 @@
 
 . /etc/default/rcS
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
 if test -e /dev/.devfsd
 then
        if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi

diff --git a/packages/initscripts/initscripts-1.0/tosa/devices b/packages/initscripts/initscripts-1.0/tosa/devices
index 5ae15589b81a617eb1ceab20b79955c8e3423c8d..61cfd9d7b94f6da0e0c41993bf47b4f53e73714b 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/tosa/devices
+++ b/packages/initscripts/initscripts-1.0/tosa/devices
@@ -5,6 +5,11 @@
 
 . /etc/default/rcS
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
 if test -e /dev/.devfsd
 then
        if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi

diff --git a/packages/initscripts/initscripts-1.0/uml/devices b/packages/initscripts/initscripts-1.0/uml/devices
index fc1d96788be8cddf80e71b2ff19f6060a5d8320e..d6459c163305f140ec2749ff2a67e7d1e029cd44 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/uml/devices
+++ b/packages/initscripts/initscripts-1.0/uml/devices
@@ -5,6 +5,11 @@
 
 . /etc/default/rcS
 
+# exit without doing anything if udev is active
+if test -e /dev/.udevdb; then
+    exit 0
+fi
+
 if test -e /dev/.devfsd
 then
        if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 058dc3d2d8121c8801bdfa2c7f180958c72cc43d..8c735b7a5ee4fb476e38888c7af9d080b02f234e 100644 (file)
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r46"
+PR = "r47"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -30,8 +30,8 @@ SRC_URI = "file://halt \
            file://umountnfs.sh \
            file://sysfs.sh \
            file://device_table.txt \
-          file://corgikeymap-2.6.map \
-          file://tosakeymap-2.6.map"
+           file://corgikeymap-2.6.map \
+           file://tosakeymap-2.6.map"
 
 SRC_URI_append_arm = " file://alignment.sh"
 SRC_URI_append_openzaurus = " file://checkversion"