[backfire] block-mount: do not hotplug-mount partitions marked as overlay root, hopef...

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@29502 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/block-mount/Makefile b/package/block-mount/Makefile
index abcf3eb57aedf685a0c1c1f5a60a8785d55a9333..c1df16412215865c69e80843122a7f723ad65624 100644 (file)
--- 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 80f74b210b2f0d271340dd188ba7f074e28cc126..56ff76ed184a7cdcbd416884893aebda5521639a 100644 (file)
--- 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
 }