View | Details | Raw Unified | Return to bug 218743
Collapse All | Expand All

(-)/etc/autofs/special_media (-3 / +12 lines)
Lines 9-15 Link Here
9
	local _fstype _fstype_and_label _label _p
9
	local _fstype _fstype_and_label _label _p
10
10
11
	for _p in ${providers}; do
11
	for _p in ${providers}; do
12
		_fstype_and_label="$(fstyp -l "/dev/${_p}" 2> /dev/null)"
12
		_fstype_and_label="$(fstyp -ul "/dev/${_p}" 2> /dev/null)"
13
		if [ $? -ne 0 ]; then
13
		if [ $? -ne 0 ]; then
14
			# Ignore devices for which we were unable
14
			# Ignore devices for which we were unable
15
			# to determine filesystem type.
15
			# to determine filesystem type.
Lines 39-44 Link Here
39
	_p="$2"
39
	_p="$2"
40
40
41
	case "${_fstype}" in
41
	case "${_fstype}" in
42
	"exfat")
43
		if [ -f "/usr/local/sbin/mount.exfat" ]; then
44
			echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype},nosuid	:/dev/${_p}" 
45
		else
46
			/usr/bin/logger -p info -t "special_media[$$]" \
47
			    "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-exfat first"
48
			exit 1
49
		fi
50
		;;
42
	"ntfs")
51
	"ntfs")
43
		if [ -f "/usr/local/bin/ntfs-3g" ]; then
52
		if [ -f "/usr/local/bin/ntfs-3g" ]; then
44
			echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid	:/dev/${_p}" 
53
			echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid	:/dev/${_p}" 
Lines 63-76 Link Here
63
72
64
	_key="$1"
73
	_key="$1"
65
74
66
	_fstype="$(fstyp "/dev/${_key}" 2> /dev/null)"
75
	_fstype="$(fstyp -u "/dev/${_key}" 2> /dev/null)"
67
	if [ $? -eq 0 ]; then
76
	if [ $? -eq 0 ]; then
68
		print_map_entry "${_fstype}" "${_key}"
77
		print_map_entry "${_fstype}" "${_key}"
69
		return
78
		return
70
	fi
79
	fi
71
80
72
	for _p in ${providers}; do
81
	for _p in ${providers}; do
73
		_fstype_and_label="$(fstyp -l "/dev/${_p}" 2> /dev/null)"
82
		_fstype_and_label="$(fstyp -ul "/dev/${_p}" 2> /dev/null)"
74
		if [ $? -ne 0 ]; then
83
		if [ $? -ne 0 ]; then
75
			# Ignore devices for which we were unable
84
			# Ignore devices for which we were unable
76
			# to determine filesystem type.
85
			# to determine filesystem type.

Return to bug 218743