Initscripts: add udev guard to all devices scripts

14 files changed, 68 insertions, 3 deletions

diff --git a/packages/initscripts/initscripts-1.0/akita/devices b/packages/initscripts/initscripts-1.0/akita/devices
index b3a3323b8a..083090ecb9 100755
--- 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 f80b7f9edb..04fffbac10 100755
--- 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 b3a3323b8a..083090ecb9 100755
--- 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 7413e455b0..9d1624428a 100755
--- 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 d7b346a655..0e59229225 100755
--- 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 d7b346a655..0e59229225 100755
--- 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 d7b346a655..0e59229225 100755
--- 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 d7b346a655..0e59229225 100755
--- 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 7413e455b0..9d1624428a 100755
--- 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 d7b346a655..0e59229225 100644
--- 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 b3a3323b8a..083090ecb9 100755
--- 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 5ae15589b8..61cfd9d7b9 100755
--- 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 fc1d96788b..d6459c1633 100755
--- 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 058dc3d2d8..8c735b7a5e 100644
--- 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"