[oe-commits] org.oe.oz354x udev: Auto-add the rootfs partition to mount.blacklist via postinst to work around a bug in the auto-mounter

[coredump commit]

udev: Auto-add the rootfs partition to mount.blacklist via postinst to work around a bug in the auto-mounter

Author: coredump at openembedded.org
Branch: org.openembedded.oz354x
Revision: 34d507a479202c8e35c0665f8414f9fb7e9e2e72
ViewMTN: http://monotone.openembedded.org/revision.psp?id=34d507a479202c8e35c0665f8414f9fb7e9e2e72
Files:
1
packages/udev/files/mount.sh
packages/udev/udev_084.bb
Diffs:

#
# mt diff -reeb17b2a44ae1e4011d17a588f6209b68a49e213 -r34d507a479202c8e35c0665f8414f9fb7e9e2e72
#
# 
# 
# patch "packages/udev/files/mount.sh"
#  from [025e4d2beeef84251c52f6d4c2214f3b711c4d70]
#    to [e9881d2c39ea15422aeb552e6916c546745f8421]
# 
# patch "packages/udev/udev_084.bb"
#  from [f3ca3994ea4efda376739a39d6cbc6882faf87db]
#    to [976db27579322ab7e5ad19a5ab3fe841b589ebfe]
# 
============================================================
--- packages/udev/files/mount.sh	025e4d2beeef84251c52f6d4c2214f3b711c4d70
+++ packages/udev/files/mount.sh	e9881d2c39ea15422aeb552e6916c546745f8421
@@ -50,6 +50,11 @@ if [ "$ACTION" = "add" ] && [ -n "$DEVNA
 	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
============================================================
--- packages/udev/udev_084.bb	f3ca3994ea4efda376739a39d6cbc6882faf87db
+++ packages/udev/udev_084.bb	976db27579322ab7e5ad19a5ab3fe841b589ebfe
@@ -16,7 +16,7 @@ INITSCRIPT_PARAMS = "start 03 S . start 
 
 INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ."
 
-PR = "r12"
+PR = "r13"
 
 FILES_${PN} += "${base_libdir}"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
@@ -55,6 +55,19 @@ pkg_postinst_append() {
 
 pkg_postinst_append() {
 	update-rc.d -s udev_network_queue.sh start 41 S . start 55 0 6 .
+	
+	# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
+	# causing confusion with fsck on boot
+	
+        while read dev mp fs junk
+        do
+                if test "$mp" = "/"
+                then
+                        root_partition="$dev"
+                        echo "$root_partition" >> /etc/udev/mount.blacklist
+                fi
+        done < /etc/fstab
+	
 }