From 3a5051276fafe8a9e6b45439d42de47749d51145 Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 29 Jan 2006 10:23:02 +0000
Subject: udev: make work with util-linux mount in all  - busybox requires -o
 move, util-linux requires --move

---
 packages/udev/files/init  | 16 +++++++++++++---
 packages/udev/udev.inc    |  2 +-
 packages/udev/udev_058.bb |  2 +-
 packages/udev/udev_063.bb |  2 +-
 packages/udev/udev_065.bb |  2 +-
 packages/udev/udev_070.bb |  2 +-
 packages/udev/udev_071.bb |  2 +-
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/udev/files/init b/packages/udev/files/init
index 6ad6fd5811..1022b40c89 100755
--- a/packages/udev/files/init
+++ b/packages/udev/files/init
@@ -52,9 +52,19 @@ mount_tmpfs() {
 
   mkdir -p /dev/.static/dev
   chmod 700 /dev/.static/
-  # Make sure it's busybox mount we're using. util-linux mount doesn't handle
-  # -o move. 
-  busybox mount -n -o move /etc/udev /dev/.static/dev
+  # The mount options in busybox are non-standard...
+  if test -x /bin/mount.util-linux
+  then
+    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
+  elif test -x /bin/busybox
+  then
+    busybox mount -n -o move /etc/udev /dev/.static/dev
+  else
+    echo "udev requires an identifiable mount command, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
 }
 
 # I hate this hack.  -- Md
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index a3896a6978..a2883aef50 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -20,7 +20,7 @@ FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
 inherit update-rc.d
 
 INITSCRIPT_NAME = "udev"
-INITSCRIPT_PARAMS = "start 04 S ."
+INITSCRIPT_PARAMS = "start 04 S . start 55 0 6 ."
 
 export CROSS = "${TARGET_PREFIX}"
 export HOSTCC = "${BUILD_CC}"
diff --git a/packages/udev/udev_058.bb b/packages/udev/udev_058.bb
index 4c346b9ab7..9f904f4d1e 100644
--- a/packages/udev/udev_058.bb
+++ b/packages/udev/udev_058.bb
@@ -7,5 +7,5 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 
 include udev.inc
 
-PR = "r5"
+PR = "r6"
 UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/"
diff --git a/packages/udev/udev_063.bb b/packages/udev/udev_063.bb
index bf80af8131..9d64ad3363 100644
--- a/packages/udev/udev_063.bb
+++ b/packages/udev/udev_063.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 
 include udev.inc
 
-PR = "r4"
+PR = "r5"
 UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/"
 
 #FIXME UDEV MIGRATION PLAN:
diff --git a/packages/udev/udev_065.bb b/packages/udev/udev_065.bb
index d05a8b84b7..74cb9cb9a3 100644
--- a/packages/udev/udev_065.bb
+++ b/packages/udev/udev_065.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 
 include udev.inc
 
-PR = "r2"
+PR = "r3"
 UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/"
 
 #FIXME UDEV MIGRATION PLAN:
diff --git a/packages/udev/udev_070.bb b/packages/udev/udev_070.bb
index e5f0409b17..4540720fc7 100644
--- a/packages/udev/udev_070.bb
+++ b/packages/udev/udev_070.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 
 include udev.inc
 
-PR = "r5"
+PR = "r6"
 
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
 
diff --git a/packages/udev/udev_071.bb b/packages/udev/udev_071.bb
index 4540720fc7..937462de85 100644
--- a/packages/udev/udev_071.bb
+++ b/packages/udev/udev_071.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 
 include udev.inc
 
-PR = "r6"
+PR = "r8"
 
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
 
-- 
cgit v1.2.3