[oe-commits] org.oe.dev SlugOS: udev - do not attempt to mount a device via fstab since mounting on

[mwester commit]

SlugOS: udev - do not attempt to mount a device via fstab since mounting on
SlugOS is done via UUID, not device names.

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: af290d94e260037595c3cc0686345dfc706a4fab
ViewMTN: http://monotone.openembedded.org/revision/info/af290d94e260037595c3cc0686345dfc706a4fab
Files:
1
packages/udev/files/slugos/mount.sh
packages/udev/udev_100.bb
Diffs:

#
# mt diff -r9b11c07033faf21bf0ab6c88eab5ac83b5bd536a -raf290d94e260037595c3cc0686345dfc706a4fab
#
# 
# 
# add_file "packages/udev/files/slugos/mount.sh"
#  content [9e59c21651fc2f3094b4be636f3d58bf29c2b0c7]
# 
# patch "packages/udev/udev_100.bb"
#  from [ba7ba1e986f3e6a91b52b018b80113898d5f8cab]
#    to [72309dab97aeccd4e512bd8d643d6467df4340e8]
# 
============================================================
--- packages/udev/files/slugos/mount.sh	9e59c21651fc2f3094b4be636f3d58bf29c2b0c7
+++ packages/udev/files/slugos/mount.sh	9e59c21651fc2f3094b4be636f3d58bf29c2b0c7
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# Called from udev
+# Attemp to mount any added block devices 
+# and remove any removed devices
+#
+
+MOUNT="/bin/mount"
+PMOUNT="/usr/bin/pmount"
+UMOUNT="/bin/umount"
+name="`basename "$DEVNAME"`"
+
+for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
+do
+	if ( echo "$DEVNAME" | grep -q "$line" )
+	then
+		logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
+		exit 0
+	fi
+done
+
+automount() {	
+	! test -d "/media/$name" && mkdir -p "/media/$name"
+	
+	if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name"
+	then
+		#logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
+		rm_dir "/media/$name"
+	else
+		logger "mount.sh/automount" "Auto-mount of [/media/$name] successful"
+		touch "/tmp/.automount-$name"
+	fi
+}
+	
+rm_dir() {
+	# We do not want to rm -r populated directories
+	if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1"
+	then
+		! test -z "$1" && rm -r "$1"
+	else
+		logger "mount.sh/automount" "Not removing non-empty directory [$1]"
+	fi
+}
+
+if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
+	# SlugOS: we pivot to the rootfs based on UUID, not on fstab -- so the fstab may not
+	# be correct at this point in the boot.  So we must not let udev mount devices based
+	# soley on the fstab, lest we mount overtop the real rootfs.  For now we just comment
+	# out the logic below and let the automount logic (far below) deal with all udev mount
+	# operations.
+	#if [ -x "$PMOUNT" ]; then
+	#	$PMOUNT $DEVNAME 2> /dev/null
+	#elif [ -x $MOUNT ]; then
+	#	$MOUNT $DEVNAME 2> /dev/null
+	#fi
+	
+	# If the device isn't mounted at this point, it isn't configured in fstab
+	# 20061107: Small correction: The rootfs partition may be called just "rootfs" and not by
+	# 	    its true device name so this would break. If the rootfs is mounted on two places
+	#	    during boot, it confuses the heck out of fsck. So Im auto-adding the root-partition
+	#	    to /etc/udev/mount.blacklist via postinst 
+
+	cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || automount 
+	
+fi
+
+
+
+if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
+	for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
+	do
+		$UMOUNT $mnt
+	done
+	
+	# Remove empty directories from auto-mounter
+	test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
+fi
============================================================
--- packages/udev/udev_100.bb	ba7ba1e986f3e6a91b52b018b80113898d5f8cab
+++ packages/udev/udev_100.bb	72309dab97aeccd4e512bd8d643d6467df4340e8
@@ -9,12 +9,13 @@ needed to link programs with libvolume_i
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
 	   file://flags.patch;patch=1 \
 	   file://mount.blacklist \
+	   file://mount.sh \
 	   "
 
 require udev.inc