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

(-)autofs.ORIG (-3 / +3 lines)
Lines 60-74 Link Here
60
	    while read dir map options ; do
60
	    while read dir map options ; do
61
		if [ ! -z "$dir" -a ! -z "$map" -a x`echo "$map" | cut -c1` != 'x-' ] ; then
61
		if [ ! -z "$dir" -a ! -z "$map" -a x`echo "$map" | cut -c1` != 'x-' ] ; then
62
		    map=`echo "/etc/$map" | sed -e 's:^/etc//:/:'`
62
		    map=`echo "/etc/$map" | sed -e 's:^/etc//:/:'`
63
		    options=`echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g'`
63
		    # options=`echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g'`
64
		    if echo $options | grep -- '-t' >/dev/null 2>&1 ; then
64
		    if echo $options | grep -- '-t' >/dev/null 2>&1 ; then
65
			mountoptions="--timeout $(echo $options | \
65
			mountoptions="--timeout $(echo $options | \
66
			    sed 's/^.*-t\(imeout\)*[ \t]*\([0-9][0-9]*\).*$/\2/g')"
66
			    sed 's/^.*-t\(imeout\)*[= \t]*\([0-9][0-9]*\).*$/\2/g')"
67
    else
67
    else
68
			mountoptions=""
68
			mountoptions=""
69
		    fi
69
		    fi
70
		    options=`echo "$options" | sed -e '
70
		    options=`echo "$options" | sed -e '
71
			s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g
71
			s/--*t\(imeout\)*[= \t]*[0-9][0-9]*//g
72
			s/\(^\|[ \t]\)-/\1/g'`
72
			s/\(^\|[ \t]\)-/\1/g'`
73
		    if [ -x $map ]; then
73
		    if [ -x $map ]; then
74
			echo "$DAEMON $daemonoptions $mountoptions $dir program $map $options $localoptions"
74
			echo "$DAEMON $daemonoptions $mountoptions $dir program $map $options $localoptions"

Return to bug 117672