diff -ruN /etc/net/scripts/functions\~ /etc/net/scripts/functions --- /etc/net/scripts/functions~ 2006-01-23 13:10:42 +0300 +++ /etc/net/scripts/functions 2006-02-28 00:31:28 +0300 @@ -242,12 +242,12 @@ elif [ -n "$MYIFACEDIR" -a -s "$MYIFACEDIR/selectprofile" -a -x "$MYIFACEDIR/selectprofile" ]; then NETPROFILE=`$MYIFACEDIR/selectprofile $0 | head -1 | cut -d' ' -f1` elif [ -z "$NETPROFILE" ]; then - if [ -s "$PROFILE_FILE" -a -r "$PROFILE_FILE" ]; then - NETPROFILE=`$DENOISE -m 1 "$PROFILE_FILE" | cut -d' ' -f1` - elif [ -r "$PROC_CMDLINE" ]; then + if [ -r "$PROC_CMDLINE" ]; then # try to fetch profile name from kernel options NETPROFILE=`cat "$PROC_CMDLINE" | sed 's/ / /g' | \ sed 's/ /\n/g' | egrep '^netprofile=' | cut -d'=' -f2` + elif [ -s "$PROFILE_FILE" -a -r "$PROFILE_FILE" ]; then + NETPROFILE=`$DENOISE -m 1 "$PROFILE_FILE" | cut -d' ' -f1` fi fi return 0