summaryrefslogtreecommitdiff
path: root/packages/udev/files
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-01-29 10:23:02 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-29 10:23:02 +0000
commit3a5051276fafe8a9e6b45439d42de47749d51145 (patch)
tree51aa66aa68fe21b049191ab0a57ab250e40c3d02 /packages/udev/files
parent33f72e52fc88f71718084aa8f4171d85e13db7af (diff)
udev: make work with util-linux mount in all
- busybox requires -o move, util-linux requires --move
Diffstat (limited to 'packages/udev/files')
-rwxr-xr-xpackages/udev/files/init16
1 files changed, 13 insertions, 3 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