[kernel] r13280 - in people/waldi/s390/sysconfig: debian etc/sysconfig/scripts/hardware etc/udev/rules.d

[Bastian Blank]

Author: waldi
Date: Fri Mar 27 17:23:58 2009
New Revision: 13280

Log:
* debian/changelog: Update.
* etc/udev/rules.d/65-sysconfig-hardware-net.rules: Provide DEVPATH.
* etc/sysconfig/scripts/hardware/udev-net:
  Use device and subsystem link instead of PHYSDEVPATH.


Modified:
   people/waldi/s390/sysconfig/debian/changelog
   people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/udev-net
   people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware-net.rules

Modified: people/waldi/s390/sysconfig/debian/changelog
==============================================================================
--- people/waldi/s390/sysconfig/debian/changelog	(original)
+++ people/waldi/s390/sysconfig/debian/changelog	Fri Mar 27 17:23:58 2009
@@ -1,3 +1,9 @@
+sysconfig (0.0.9) UNRELEASED; urgency=low
+
+  * Don't use the deprecated PHYSDEVPATH sysfs interface.
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 27 Mar 2009 18:20:01 +0100
+
 sysconfig (0.0.8) unstable; urgency=low
 
   * Split udev rules file. One part needs to run before the persistent rules,

Modified: people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/udev-net
==============================================================================
--- people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/udev-net	(original)
+++ people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/udev-net	Fri Mar 27 17:23:58 2009
@@ -7,8 +7,9 @@
 . ${SYSCONFIG:=/etc/sysconfig}/scripts/hardware/functions
 
 DEVPATH=$1
-ID=$(echo /sys/$DEVPATH | sed -e 's,.*/,,')
-BUS=$(readlink /sys/$DEVPATH/bus | sed -e 's,.*/,,')
+
+ID=$(readlink /sys/$DEVPATH/device | sed -e 's,.*/,,')
+BUS=$(readlink /sys/$DEVPATH/device/subsystem | sed -e 's,.*/,,')
 
 [ $BUS = "ccwgroup" ] && BUS=ccw
 

Modified: people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware-net.rules
==============================================================================
--- people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware-net.rules	(original)
+++ people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware-net.rules	Fri Mar 27 17:23:58 2009
@@ -1,2 +1,2 @@
-SUBSYSTEM=="net", IMPORT{program}="/etc/sysconfig/scripts/hardware/udev-net $env{PHYSDEVPATH}"
+SUBSYSTEM=="net", IMPORT{program}="/etc/sysconfig/scripts/hardware/udev-net $DEVPATH"
 SUBSYSTEM=="net", ENV{INTERFACE_NAME}=="?*", NAME="$env{INTERFACE_NAME}"