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

(-)/etc/net/scripts/functions~ (-3 / +3 lines)
Lines 242-253 Link Here
242
	elif [ -n "$MYIFACEDIR" -a -s "$MYIFACEDIR/selectprofile" -a -x "$MYIFACEDIR/selectprofile" ]; then
242
	elif [ -n "$MYIFACEDIR" -a -s "$MYIFACEDIR/selectprofile" -a -x "$MYIFACEDIR/selectprofile" ]; then
243
		NETPROFILE=`$MYIFACEDIR/selectprofile $0 | head -1 | cut -d' ' -f1`
243
		NETPROFILE=`$MYIFACEDIR/selectprofile $0 | head -1 | cut -d' ' -f1`
244
	elif [ -z "$NETPROFILE" ]; then
244
	elif [ -z "$NETPROFILE" ]; then
245
		if [ -s "$PROFILE_FILE" -a -r "$PROFILE_FILE" ]; then
245
		if [ -r "$PROC_CMDLINE" ]; then
246
			NETPROFILE=`$DENOISE -m 1 "$PROFILE_FILE" | cut -d' ' -f1`
247
		elif [ -r "$PROC_CMDLINE" ]; then
248
			# try to fetch profile name from kernel options
246
			# try to fetch profile name from kernel options
249
			NETPROFILE=`cat "$PROC_CMDLINE" | sed 's/  / /g' | \
247
			NETPROFILE=`cat "$PROC_CMDLINE" | sed 's/  / /g' | \
250
			sed 's/ /\n/g' | egrep '^netprofile=' | cut -d'=' -f2`
248
			sed 's/ /\n/g' | egrep '^netprofile=' | cut -d'=' -f2`
249
		elif [ -s "$PROFILE_FILE" -a -r "$PROFILE_FILE" ]; then
250
			NETPROFILE=`$DENOISE -m 1 "$PROFILE_FILE" | cut -d' ' -f1`
251
		fi
251
		fi
252
	fi
252
	fi
253
	return 0
253
	return 0

Return to bug 9171