From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 11 Dec 2011 17:28:01 +0000 (+0000)
Subject: [backfire] block-mount: do not hotplug-mount partitions marked as overlay root, hopef... 
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=120602d11da9ea0d8c17a24ab8cd9a8d1d6fe525;p=openwrt%2Fsvn-archive%2Farchive.git

[backfire] block-mount: do not hotplug-mount partitions marked as overlay root, hopefully stops the endless "my extroot does not work" posts


SVN-Revision: 29502
---

diff --git a/package/block-mount/Makefile b/package/block-mount/Makefile
index abcf3eb57a..c1df164122 100644
--- a/package/block-mount/Makefile
+++ b/package/block-mount/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 # Copyright 2010 Vertical Communications
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=block-mount
 PKG_VERSION:=0.1.0
-PKG_RELEASE:=2.1
+PKG_RELEASE:=2.2
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/block-mount/files/block.sh b/package/block-mount/files/block.sh
index 80f74b210b..56ff76ed18 100644
--- a/package/block-mount/files/block.sh
+++ b/package/block-mount/files/block.sh
@@ -225,8 +225,10 @@ config_get_mount_section_by_device() {
 		return 0	
 	}
 	config_foreach config_get_mount mount "$msbd_device"
-	[ -n "$msbd_mount_device" ] && config_create_mount_fstab_entry "$msbd_mount_device" "$msbd_target" "$msbd_fstype" "$msbd_options" "$msbd_enabled" 
-	mount_dev_section_cb "$msbd_mount_cfg" "$msbd_target" "$msbd_mount_device" "$msbd_fstype" "$msbd_options" "$msbd_enabled" "$msbd_enabled_fsck" "$msbd_uuid" "$msbd_label" "$msbd_is_rootfs"
+	[ "$msbd_is_rootfs" -gt 0 ] || {
+		[ -n "$msbd_mount_device" ] && config_create_mount_fstab_entry "$msbd_mount_device" "$msbd_target" "$msbd_fstype" "$msbd_options" "$msbd_enabled" 
+		mount_dev_section_cb "$msbd_mount_cfg" "$msbd_target" "$msbd_mount_device" "$msbd_fstype" "$msbd_options" "$msbd_enabled" "$msbd_enabled_fsck" "$msbd_uuid" "$msbd_label" "$msbd_is_rootfs"
+	}
 	reset_block_cb
 }