View | Details | Raw Unified | Return to bug 116931 | Differences between
and this patch

Collapse All | Expand All

(-)etc/rc.d/mdconfig2 (-3 / +20 lines)
Lines 39-44 Link Here
39
start_precmd='[ -n "${_mdconfig2_list}" ]'
39
start_precmd='[ -n "${_mdconfig2_list}" ]'
40
required_modules="geom_md:g_md"
40
required_modules="geom_md:g_md"
41
41
42
fsck_skip_fs="cd9660 udf"
43
44
in_list()
45
{
46
	local _x _list _i
47
	_x=$1
48
	_list=$2
49
	for _i in ${_list}; do
50
		[ "${_x}" = "${_i}" ] && return 0
51
	done
52
	return 1
53
}
54
42
is_readonly()
55
is_readonly()
43
{
56
{
44
	local _mp _ret
57
	local _mp _ret
Lines 95-104 Link Here
95
		for _i in `df ${_file} 2>/dev/null`; do _fs=${_i}; done
108
		for _i in `df ${_file} 2>/dev/null`; do _fs=${_i}; done
96
	fi
109
	fi
97
110
111
	_fs_type=`awk -v d="${_dev}" '$1 == d {print $3; exit}' /etc/fstab`
112
98
	# Debugging help.
113
	# Debugging help.
99
	debug "${_md} config: ${_config}"
114
	debug "${_md} config: ${_config}"
100
	debug "${_md} type: ${_type}"
115
	debug "${_md} type: ${_type}"
101
	debug "${_md} dev: ${_dev}"
116
	debug "${_md} dev: ${_dev}"
117
	debug "${_md} fs_type: ${_fs_type}"
102
	debug "${_md} file: ${_file}"
118
	debug "${_md} file: ${_file}"
103
	debug "${_md} fs: ${_fs}"
119
	debug "${_md} fs: ${_fs}"
104
	debug "${_md} owner: ${_owner}"
120
	debug "${_md} owner: ${_owner}"
Lines 109-115 Link Here
109
125
110
mdconfig2_start()
126
mdconfig2_start()
111
{
127
{
112
	local _md _fs _mp _mounted _dev _config _type _file _owner _perms _files _populate _fsck_cmd _i
128
	local _md _fs _mp _mounted _dev _config _type _file _owner _perms _files _populate _fsck_cmd _fs_type _i
113
129
114
	for _md in ${_mdconfig2_list}; do
130
	for _md in ${_mdconfig2_list}; do
115
		init_variables ${_md}
131
		init_variables ${_md}
Lines 136-143 Link Here
136
				echo "Creating ${_md} device failed, moving on."
152
				echo "Creating ${_md} device failed, moving on."
137
				continue
153
				continue
138
			fi
154
			fi
139
			# Skip fsck for uzip devices.
155
			# Skip fsck for uzip devices and for fs types listed in fsck_skip_fs
140
			if [ "${_file}" != "${_file%.uzip}" ]; then
156
			if [ "${_file}" != "${_file%.uzip}" ] || 
157
			   in_list "${_fs_type}" "${fsck_skip_fs}"; then
141
				_fsck_cmd=":"
158
				_fsck_cmd=":"
142
			elif checkyesno background_fsck; then
159
			elif checkyesno background_fsck; then
143
				_fsck_cmd="fsck -F"
160
				_fsck_cmd="fsck -F"

Return to bug 116931