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

(-)/etc/init.d/autofs (+8 lines)
Lines 67-74 Link Here
67
    else
67
    else
68
			mountoptions=""
68
			mountoptions=""
69
		    fi
69
		    fi
70
		    if echo $options | grep -- '-g' >/dev/null 2>&1 ; then
71
			mountoptions="--ghost"
72
		    fi
70
		    options=`echo "$options" | sed -e '
73
		    options=`echo "$options" | sed -e '
71
			s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g
74
			s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g
75
			s/--*g\(host\)*//g
72
			s/\(^\|[ \t]\)-/\1/g'`
76
			s/\(^\|[ \t]\)-/\1/g'`
73
		    if [ -x $map ]; then
77
		    if [ -x $map ]; then
74
			echo "$DAEMON $daemonoptions $mountoptions $dir program $map $options $localoptions"
78
			echo "$DAEMON $daemonoptions $mountoptions $dir program $map $options $localoptions"
Lines 99-106 Link Here
99
			mountoptions="--timeout $(echo $options | \
103
			mountoptions="--timeout $(echo $options | \
100
			    sed 's/^.*-t\(imeout\)*[ \t]*\([0-9][0-9]*\).*$/\2/g')"
104
			    sed 's/^.*-t\(imeout\)*[ \t]*\([0-9][0-9]*\).*$/\2/g')"
101
		    fi
105
		    fi
106
		    if echo $options | grep -- '-g' >/dev/null 2>&1 ; then
107
			mountoptions="--ghost"
108
		    fi
102
		    options=`echo "$options" | sed -e '
109
		    options=`echo "$options" | sed -e '
103
			s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g
110
			s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g
111
			s/--*g\(host\)*//g
104
			s/\(^\|[ \t]\)-/\1/g'`
112
			s/\(^\|[ \t]\)-/\1/g'`
105
		    if [ -x $map ]; then
113
		    if [ -x $map ]; then
106
			echo "$DAEMON $daemonoptions $mountoptions $dir program $map $options $localoptions"
114
			echo "$DAEMON $daemonoptions $mountoptions $dir program $map $options $localoptions"

Return to bug 141182