Attachment 114509 Details for Bug 230213

[patch] Finetune the former patch.

sysconfig-0.60.4.rename_netiface.dif (text/plain), 2.71 KB, created by Dieter Jurzitza on 2007-01-23 19:29:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dieter Jurzitza

Created: 2007-01-23 19:29:58 UTC

Size: 2.71 KB

patch

obsolete

>--- scripts/rename_netiface.original	2006-04-05 11:39:49.000000000 +0200
>+++ scripts/rename_netiface	2007-01-23 19:52:42.000000000 +0100
>@@ -52,6 +52,16 @@
> }
> 
> check_if_name_is_free() {
>+	# we set it to no at the begining
>+	WRITE_RULE=no
>+	# First call: check whether there is an entry for this card! If so, get out of here! Return the name of the persistent IF in PERSISTENT_NAME
>+	PERSISTENT_NAME=`grep -m 1 "^[^#].*{address}==\"${DEV_ID}\", IMPORT=\"/lib/udev/rename_netiface" $RULE_FILE | sed 's/.*rename\_netiface %k //g; s/\"//g'`
>+	if [ "${PERSISTENT_NAME}" != "" ]; then
>+		return 0
>+	fi
>+	# if we come across this point, we set WRITE_RULE to yes
>+	WRITE_RULE=yes
>+	# Second call: check whether the IF is used by some card!
> 	grep -qs "^[^#].*rename_netiface %k $NEWNAME\"" $RULE_FILE && return 1
> 	cat $USED_IFACE_FILE_STUB* \
> 	    | grep -vs "$DEV_ID" \
>@@ -105,7 +115,9 @@
> esac
> # Also check if interface is not an vlan interface
> test -f "/proc/net/vlan/$OLDNAME" && exit 0
>-declare -i IFNUM=${OLDNAME##$NAMEBASE}
>+# in contrast to the original script, searching should always start at IFNUM=0, 
>+# because we do not know about configurations of the past!
>+declare -i IFNUM=0
> 
> if [ "$PHYSDEVBUS" == ccwgroup ] ; then
> 	get_device_id() {
>@@ -135,12 +147,12 @@
> 	# currently has. If this name is already occupied, then increase the
> 	# number and try again.
> 	# To check if a name is occupied we have to look in
>-	# /etc/udev/rules.d/60-net_*.rules and in /tmp/used_interface_names*.
>+	# /etc/udev/rules.d/30-net_*.rules and in /tmp/used_interface_names*.
> 	# The latter serves as temporary registration file to avoid race
> 	# 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
>@@ -172,8 +184,22 @@
> 		error_exit 6 "could not get a free persistent interfacename" \
> 		         "for $OLDNAME ($DEV_ID)"
> 	done
>-	WRITE_RULE=yes
> 	info_mesg "$OLDNAME: new persistent name for $DEV_ID is $NEWNAME"
>+	# check whether we expect our IF at a certain location!
>+	if [ "${PERSISTENT_NAME}" != "" ]; then
>+		# check whether the expected name of our IF differs from what we get!
>+		if [ ${NEWNAME} != ${PERSISTENT_NAME} ] ; then
>+			if [ -d /sys/class/net/${PERSISTENT_NAME} ]; then
>+				if nameif -r "${PERSISTENT_NAME}" "${NEWNAME}" 2>/dev/null 1>&2; then
>+					write_rule || error_exit 8 "Name ${PERSISTENT_NAME} for ${DEV_ID} is NOT" \
>+								"persistent"
>+					info_mesg "${NEWNAME} -> ${PERSISTENT_NAME}: immediate success"
>+				fi
>+				usleep $((RANDOM%600+700))000
>+			fi
>+			NEWNAME="${PERSISTENT_NAME}"
>+		fi
>+	fi
> fi
> if [ -z "$NEWNAME" ] ; then
> 	error_exit 7 "cannot get a valid new interface name"

Actions: View | Diff

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