SOURCES: udev-create_persistent, udev-functions, udev-modprobe.rul...

[freetz]

Author: freetz                       Date: Sun Apr 23 17:13:53 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use nameif / cut&paste typos fixed

---- Files affected:
SOURCES:
   udev-create_persistent (1.1 -> 1.2) , udev-functions (1.1 -> 1.2) , udev-modprobe.rules (1.13 -> 1.14) , udev-net.helper (1.3 -> 1.4) , udev.rules (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SOURCES/udev-create_persistent
diff -u SOURCES/udev-create_persistent:1.1 SOURCES/udev-create_persistent:1.2
--- SOURCES/udev-create_persistent:1.1	Sun Apr 23 18:08:13 2006
+++ SOURCES/udev-create_persistent	Sun Apr 23 19:13:48 2006
@@ -13,13 +13,3 @@
     TARGET="SYMLINK"
     ADD="+"
 fi
-
-read_rules() {
-    if [ ! -f $UDEV_RULES_FILE ]; then
-	cat > $UDEV_RULES_FILE <<EOF
-# autogenerated udev persistent rules for $SUBSYSTEM subsystem
-#
-EOF
-    fi
-    EXISTING=`sed -ne "/^[[:space:]]*#.*/b; s/.*$TARGET$ADD=\"\([^\"]*\)\".*/\1/; T; p" $UDEV_RULES_FILE | sort -u`
-}

================================================================
Index: SOURCES/udev-functions
diff -u SOURCES/udev-functions:1.1 SOURCES/udev-functions:1.2
--- SOURCES/udev-functions:1.1	Sun Apr 23 18:08:13 2006
+++ SOURCES/udev-functions	Sun Apr 23 19:13:48 2006
@@ -26,3 +26,13 @@
     MATCH=$1
     echo "SUBSYSTEM==\"$SUBSYSTEM\", ACTION==\"add\", $MATCH, $TARGET$ADD=\"$RESULTS\", ENV{GENERATED}=\"yes\"" >> $UDEV_RULES_FILE
 }
+
+read_rules() {
+    if [ ! -f $UDEV_RULES_FILE ]; then
+        cat > $UDEV_RULES_FILE <<EOF
+# autogenerated udev persistent rules for $SUBSYSTEM subsystem
+#
+EOF
+    fi
+    EXISTING=`sed -ne "/^[[:space:]]*#.*/b; s/.*$TARGET$ADD=\"\([^\"]*\)\".*/\1/; T; p" $UDEV_RULES_FILE | sort -u`
+}

================================================================
Index: SOURCES/udev-modprobe.rules
diff -u SOURCES/udev-modprobe.rules:1.13 SOURCES/udev-modprobe.rules:1.14
--- SOURCES/udev-modprobe.rules:1.13	Sun Mar 12 17:07:24 2006
+++ SOURCES/udev-modprobe.rules	Sun Apr 23 19:13:48 2006
@@ -1,4 +1,5 @@
-ACTION!="add", GOTO="hotplug_not_add_event"
+ACTION!="add", GOTO="hot
+plug_not_add_event"
 
 # check a driver is already loaded
 ENV{PHYSDEVDRIVER}=="?*", GOTO="hotplug_driver_loaded"
@@ -41,4 +42,4 @@
 
 LABEL="hotplug_not_add_event"
 
-SUBSYSTEM=="net", ENV{INTERFACE}=="*", RUN+="/lib/udev/udev_net_helper"
+SUBSYSTEM=="net", ENV{INTERFACE}=="*", RUN+="/lib/udev/net_helper"

================================================================
Index: SOURCES/udev-net.helper
diff -u SOURCES/udev-net.helper:1.3 SOURCES/udev-net.helper:1.4
--- SOURCES/udev-net.helper:1.3	Fri Oct 21 09:49:43 2005
+++ SOURCES/udev-net.helper	Sun Apr 23 19:13:48 2006
@@ -47,19 +47,15 @@
 	    # we can't do much here without distro-specific knowledge
 	    # such as whether/how to invoke DHCP, set up bridging, etc.
 
-	    # Run ifrename as needed - Jean II
+	    # Run nameif as needed - Jean II
 	    # Remap interface names based on MAC address. This workaround
 	    # the dreaded configuration problem "all my cards are 'eth0'"...
 	    # This needs to be done before ifup otherwise ifup will get
 	    # confused by the name changed and because iface need to be
 	    # down to change its name.
-	    if [ -x /sbin/ifrename ] && [ -r /etc/iftab ]; then
-		debug_mesg invoke ifrename for $INTERFACE
-		NEWNAME=`/sbin/ifrename -i $INTERFACE`
-		if [ -n "$NEWNAME" ]; then
-		    debug_mesg iface $INTERFACE is remapped to $NEWNAME
-		    INTERFACE=$NEWNAME
-		fi;
+	    if [ -x /sbin/nameif ] && [ -r /etc/mactab ]; then
+		debug_mesg invoke nameif for $INTERFACE
+		NEWNAME=`/sbin/nameif`
 	    fi
 
 	    # conform to network service (AUTOMATIC_IFCFG)

================================================================
Index: SOURCES/udev.rules
diff -u SOURCES/udev.rules:1.32 SOURCES/udev.rules:1.33
--- SOURCES/udev.rules:1.32	Wed Apr  5 19:42:39 2006
+++ SOURCES/udev.rules	Sun Apr 23 19:13:48 2006
@@ -40,8 +40,6 @@
 BUS=="scsi",	KERNEL="sr[0-9]*", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
 BUS=="scsi",	KERNEL="scd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
 
-ENV{ID_CDROM}=="?*", PROGRAM="write_cd_aliases", SYMLINK+="%c"
-
 # disk devices
 KERNEL=="sd*",		NAME="%k", GROUP="disk"
 KERNEL=="dasd*",	NAME="%k", GROUP="disk"
@@ -253,6 +251,3 @@
 
 # debugging monitor
 RUN+="socket:/org/kernel/udev/monitor"
-
-# debug events to /events, but not on default udev_log="err"
-#ENV{UDEV_LOG}=="[4-9]", RUN+="/lib/udev/eventrecorder.sh"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/udev-create_persistent?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/udev-functions?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/udev-modprobe.rules?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SOURCES/udev-net.helper?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/udev.rules?r1=1.32&r2=1.33&f=u