Attachment 117938 Details for Bug 230213

[patch] Fix both rename_netiface and trigger_firmware_loading.sh

sysconfig-0.60.4.netiface.dif (text/plain), 4.54 KB, created by Dieter Jurzitza on 2007-02-07 20:36:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dieter Jurzitza

Created: 2007-02-07 20:36:48 UTC

Size: 4.54 KB

patch

obsolete

>--- scripts/rename_netiface.original	2006-04-05 11:39:49.000000000 +0200
>+++ scripts/rename_netiface	2007-02-07 21:02:52.000000000 +0100
>@@ -10,11 +10,12 @@
> USED_IFACE_FILE="`mktemp $USED_IFACE_FILE_STUB.XXXXXXXX`"
> 
> STAMPFILE=/tmp/dummy_stamp
>+RENAMED=yes
> trap 'rm -f $USED_IFACE_FILE
>       echo renamed > $STAMPFILE
>       echo INTERFACE=$INTERFACE
>       echo DEVPATH=${DEVPATH%/*}/$INTERFACE
>-      echo RENAMED=yes' EXIT
>+      echo RENAMED=$RENAMED' EXIT
> 
> . /etc/sysconfig/network/config
> . /etc/sysconfig/network/scripts/functions
>@@ -43,6 +44,7 @@
> 		shift
> 	fi
> 	err_mesg "$@"
>+	RENAMED=no
> 	exit $RET
> }
> 
>@@ -68,22 +70,17 @@
> write_rule() {
> 	test "$WRITE_RULE" == yes || return 0
> 	check_if_name_is_free || return 1
>+	RULE="SUBSYSTEM==\"net\", ACTION==\"add\","
> 	if [ "$PHYSDEVBUS" == ccwgroup ] ; then
>-		echo "SUBSYSTEM==\"net\", ACTION==\"add\"," \
>-		     "ENV{PHYSDEVPATH}==\"*$DEV_ID\"," \
>-		     "IMPORT=\"/lib/udev/rename_netiface %k $NEWNAME\"" \
>-		     >> $RULE_FILE
>+		RULE="$RULE ENV{PHYSDEVPATH}==\"*$DEV_ID\","
> 	elif [ "$NOMAC_HACK_APPLIED" == yes ] ; then
>-		echo "SUBSYSTEM==\"net\", ACTION==\"add\"," \
>-		     "ENV{ADDRESS}==\"$DEV_ID\"," \
>-		     "IMPORT=\"/lib/udev/rename_netiface %k $NEWNAME\"" \
>-		     >> $RULE_FILE
>+		RULE="$RULE ENV{ADDRESS}==\"$DEV_ID\","
> 	else
>-		echo "SUBSYSTEM==\"net\", ACTION==\"add\"," \
>-		     "SYSFS{address}==\"$DEV_ID\"," \
>-		     "IMPORT=\"/lib/udev/rename_netiface %k $NEWNAME\"" \
>-		     >> $RULE_FILE
>+		RULE="$RULE SYSFS{address}==\"$DEV_ID\","
> 	fi
>+	DERU="$RULE IMPORT=\".lib.udev.rename_netiface %k .*\""
>+	RULE="$RULE IMPORT=\"/lib/udev/rename_netiface %k $NEWNAME\""
>+	flock $RULE_FILE sed -i -e "\$a \\$RULE" -e "/^$DERU/d" $RULE_FILE
> 	/sbin/udevcontrol reload_rules || return 1
> 	info_mesg "New rule for $DEV_ID added."
> }
>@@ -140,7 +137,7 @@
> 	# conditions. It will be removed when the script exits.
> 
> 	NEWNAME=$OLDNAME
>-	get_device_id "$OLDNAME" "$2"
>+	get_device_id "$OLDNAME"
> 	if [ -z "$DEV_ID" ] ; then
> 		error_exit 4 "no device id for $OLDNAME"
> 	fi
>@@ -195,10 +192,16 @@
> 
> # Rename it to the temporary name.
> # Then try several times to rename it to new name
>-nameif -r "$TMPNAME" "$OLDNAME" 2>/dev/null 1>&2 \
>-    || error_exit 11 "cannot rename interface to temporary name $TMPNAME"
>-echo looping > $STAMPFILE
> declare -i LOOPS=0
>+for LOOPS in `seq 10`; do
>+	nameif -r "$TMPNAME" "$OLDNAME" 2>/dev/null 1>&2 && break
>+	test "$LOOPS" -lt 10 || error_exit 11 \
>+		"cannot rename interface to temporary name $TMPNAME"
>+	usleep 100000
>+done
>+info_mesg "renamed interface to temporary name $TMPNAME after $LOOPS tries"
>+echo looping > $STAMPFILE
>+LOOPS=0
> while [ $MAXLOOPS -gt $LOOPS ] ; do
> 	: $((LOOPS++))
> 	if nameif -r "$NEWNAME" "$TMPNAME" 2>/dev/null 1>&2; then
>@@ -220,10 +223,4 @@
> 	          "longer available"
> 	INTERFACE=$TMPNAME
> fi
>-exit 0
>-
>-
>-
>-
>-
>-
>+error_exit 13
>--- scripts/trigger_firmware_loading.sh.original	2006-11-09 19:16:53.000000000 +0100
>+++ scripts/trigger_firmware_loading.sh	2007-02-07 20:47:47.000000000 +0100
>@@ -2,34 +2,37 @@
> 
> . /etc/sysconfig/hardware/scripts/functions
> 
>+INTERFACE=$1
>+
> NOMAC_HACK_APPLIED=no
> trap 'echo NOMAC_HACK_APPLIED=$NOMAC_HACK_APPLIED
>       echo ADDRESS=$MAC_ADDRESS' EXIT
> 
>-case "$1" in
>+case "${INTERFACE}" in
> 	eth*|ath*|wlan*|ra*) : ;;
> 	*) exit 0 ;;
> esac
> 
> MAC_ADDRESS=
>-if ls /sys/class/net/$1 2>/dev/null 1>&2; then
>-	MAC_ADDRESS=`cat /sys/class/net/$INTERFACE/address`
>+if ls /sys/class/net/${INTERFACE} 2>/dev/null 1>&2; then
>+	MAC_ADDRESS=`cat /sys/class/net/${INTERFACE}/address`
> fi
>-if [ -z "$MAC_ADDRESS" ] ; then
>+if [ -z "${MAC_ADDRESS}" ] ; then
> 	exit 0
> fi
>-if [ "${MAC_ADDRESS%00:00:00}" != "$MAC_ADDRESS" ] ; then
>+if [ "${MAC_ADDRESS%00:00:00}" != "${MAC_ADDRESS}" ] ; then
> 	# Workaround for some drivers which don't request their
> 	# firmware before beeing set up and don't have a mac address
> 	# before firmware was loaded.
>-	ip link set up dev $INTERFACE
>-	ip link set down dev $INTERFACE
>+	ip link set up dev ${INTERFACE}
>+	ip link set down dev ${INTERFACE}
>+	# in any case: if we get here, NOMAC_HACK_APPLIED should be true, so set it
>+	NOMAC_HACK_APPLIED=yes
> 	# Do we have to wait some time?
> 	for i in 0 1 2 3 4 5 6 7 8 9; do
>-		MAC_ADDRESS=`cat /sys/class/net/$INTERFACE/address`
>-		info_mesg "waiting for a usefull mac address: $MAC_ADDRESS"
>-		if [ "${MAC_ADDRESS%00:00:00}" != "$MAC_ADDRESS" ] ; then
>-			NOMAC_HACK_APPLIED=yes
>+		MAC_ADDRESS=`cat /sys/class/net/${INTERFACE}/address`
>+		info_mesg "waiting for a usefull mac address: ${MAC_ADDRESS}"
>+		if [ "${MAC_ADDRESS%00:00:00}" != "${MAC_ADDRESS}" ] ; then
> 			break
> 		fi
> 		sleep 1

Actions: View | Diff

Attachments on bug 230213: 111748 | 114509 | 115398 | 115617 | 116268 | 116273 | 116349 | 116350 | 117195 | 117197 | 117199 | 117200 | 117827 | 117938 | 117939