brcm47xx: initial 2.6.39 support for brcm47xx

[openwrt.git] / package / block-mount / files / mount.sh

diff --git a/package/block-mount/files/mount.sh b/package/block-mount/files/mount.sh
index ade39ad..e96174c 100644 (file)
--- a/package/block-mount/files/mount.sh
+++ b/package/block-mount/files/mount.sh
@@ -31,20 +31,24 @@ config_mount_by_section() {
                
                found_device="$(libmount_find_device_by_id "$uuid" "$label" "$device" "$cfgdevice")"
                if [ -n "$found_device" ]; then
                
                found_device="$(libmount_find_device_by_id "$uuid" "$label" "$device" "$cfgdevice")"
                if [ -n "$found_device" ]; then

-                       if [ -z "$find_rootfs" ] || [ "$find_rootfs" -eq 0 ] || ( [ "$is_rootfs" -eq 1 ] || [ "$target" = "/" ] || [ "$target" = "/overlay" ] ); then
+                       if [ "$find_rootfs" != "1" ] || ( [ "$is_rootfs" -eq 1 ] || [ "$target" = "/" ] || [ "$target" = "/overlay" ] ); then

                                [ "$enabled_fsck" -eq 1 ] && {
                                        grep -q "$found_device" /proc/swaps || grep -q "$found_device" /proc/mounts || {
                                                libmount_fsck "$found_device" "$fstype" "$enabled_fsck"
                                        }
                                }                                                               
        
                                [ "$enabled_fsck" -eq 1 ] && {
                                        grep -q "$found_device" /proc/swaps || grep -q "$found_device" /proc/mounts || {
                                                libmount_fsck "$found_device" "$fstype" "$enabled_fsck"
                                        }
                                }                                                               
        

-                               if [ "$find_rootfs" -eq 1 ]; then
+                               if [ "$find_rootfs" = "1" ]; then

                                    if [ "$is_rootfs" -eq 1 ]; then
                                        target=/overlay
                                    if [ "$is_rootfs" -eq 1 ]; then
                                        target=/overlay

+                                   elif [ "$target" = "/" ]; then
+                                       target=/rom

                                    fi
                                else
                                    if [ "$is_rootfs" -eq 1 ] || [ "$target" = "/overlay" ]; then
                                        target=/tmp/overlay-disabled
                                    fi
                                else
                                    if [ "$is_rootfs" -eq 1 ] || [ "$target" = "/overlay" ]; then
                                        target=/tmp/overlay-disabled

+                                   elif [ "$target" = "/" ] || [ "$target" = "/rom" ]; then
+                                       target="/tmp/whole_root-disabled"

                                    fi
                                fi
                                
                                    fi
                                fi
                                


@@ -55,10 +59,13 @@ config_mount_by_section() {
                                
                        fi
                fi
                                
                        fi
                fi

-               [ "$find_rootfs" -eq 1 ] && {
+               [ "$find_rootfs" = "1" ] && {

                    [ "$target" = "/overlay" ] && {
                        rootfs_found=1
                    }
                    [ "$target" = "/overlay" ] && {
                        rootfs_found=1
                    }

+                   [ "$target" = "/rom" ] && {
+                       rootfs_found=1
+                   }

                }
                return 0        
        }
                }
                return 0        
        }