Attachment 116273 Details for Bug 230213

[patch] This fix avoids duplicate udev rules.

bug.230213.rename_netiface.fix2.diff (text/plain), 1.87 KB, created by Christian Zoz on 2007-01-30 15:40:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Zoz

Created: 2007-01-30 15:40:06 UTC

Size: 1.87 KB

patch

obsolete

>--- /lib/udev/rename_netiface	2007-01-17 08:28:23.000000000 +0100
>+++ /lib/udev/rename_netiface	2007-01-30 15:52:20.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."
> }
>@@ -226,7 +232,7 @@
> 	          "longer available"
> 	INTERFACE=$TMPNAME
> fi
>-exit 0
>+error_exit 13
> 
> 
>

Actions: View | Diff

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