Author: freetz Date: Tue Apr 25 16:04:53 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- don't rename network interfaces (handled internally by udevd), make
variables globally accessible
---- Files affected:
SOURCES:
udev-create_persistent (1.2 -> 1.3) , udev-functions (1.2 -> 1.3) ,
udev-net.helper (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/udev-create_persistent
diff -u SOURCES/udev-create_persistent:1.2 SOURCES/udev-create_persistent:1.3
--- SOURCES/udev-create_persistent:1.2 Sun Apr 23 19:13:48 2006
+++ SOURCES/udev-create_persistent Tue Apr 25 18:04:47 2006
@@ -4,8 +4,6 @@
exit -1
fi
-MAX_LOOPS=1024
-UDEV_RULES_FILE=/etc/udev/rules.d/60-persistent-${SUBSYSTEM}.rules
if [ $SUBSYSTEM = "net" ]; then
TARGET="NAME"
ADD=""
================================================================
Index: SOURCES/udev-functions
diff -u SOURCES/udev-functions:1.2 SOURCES/udev-functions:1.3
--- SOURCES/udev-functions:1.2 Sun Apr 23 19:13:48 2006
+++ SOURCES/udev-functions Tue Apr 25 18:04:48 2006
@@ -1,4 +1,6 @@
#!/bin/sh
+MAX_LOOPS=1024
+UDEV_RULES_FILE=/etc/udev/rules.d/60-persistent-${SUBSYSTEM}.rules
already_exists() {
echo $EXISTING | grep -q "\b$1\b"
================================================================
Index: SOURCES/udev-net.helper
diff -u SOURCES/udev-net.helper:1.4 SOURCES/udev-net.helper:1.5
--- SOURCES/udev-net.helper:1.4 Sun Apr 23 19:13:48 2006
+++ SOURCES/udev-net.helper Tue Apr 25 18:04:48 2006
@@ -46,19 +46,8 @@
# NOTE: network configuration relies on administered state,
# we can't do much here without distro-specific knowledge
# such as whether/how to invoke DHCP, set up bridging, etc.
-
- # 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/nameif ] && [ -r /etc/mactab ]; then
- debug_mesg invoke nameif for $INTERFACE
- NEWNAME=`/sbin/nameif`
- fi
-
# conform to network service (AUTOMATIC_IFCFG)
+
[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network
# don't do anything for non ethernet devices
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/udev-create_persistent?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/udev-functions?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/udev-net.helper?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
