diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-02-13 15:31:31 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-02-13 15:31:31 +0000 |
| commit | 23d98ff980fc428729901b6f93f5d2e84c708bc0 (patch) | |
| tree | 23acb9fcee076c6560bd414df84591f0e8ea346f /package/block-mount | |
| parent | edc937f926455754150ae45ff20a442a94f04886 (diff) | |
| download | upstream-23d98ff980fc428729901b6f93f5d2e84c708bc0.tar.gz upstream-23d98ff980fc428729901b6f93f5d2e84c708bc0.tar.bz2 upstream-23d98ff980fc428729901b6f93f5d2e84c708bc0.zip | |
block-mount: do not auto-mount anonymous mtdblock devices (fixes #10960, #10850)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30501 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/block-mount')
| -rw-r--r-- | package/block-mount/files/40-mount | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/package/block-mount/files/40-mount b/package/block-mount/files/40-mount index 0d4f669404..5118d9c104 100644 --- a/package/block-mount/files/40-mount +++ b/package/block-mount/files/40-mount @@ -69,8 +69,13 @@ if [ `basename $blkdev` != "block" ]; then } grep -q "/dev/$device" /proc/swaps || grep -q "/dev/$device" /proc/mounts || { - [ "$anon_mount" -eq 1 ] && [ -z "$use_device" ] && { - ( mkdir -p /mnt/$device && mount /dev/$device /mnt/$device ) 2>&1 | tee /proc/self/fd/2 | logger -t 'fstab' + [ "$anon_mount" -eq 1 -a -z "$use_device" ] && { + case "$device" in + mtdblock*) ;; + *) + ( mkdir -p /mnt/$device && mount /dev/$device /mnt/$device ) 2>&1 | tee /proc/self/fd/2 | logger -t 'fstab' + ;; + esac } } reset_dev_section_cb |