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

[Bastian Blank]

Author: waldi
Date: Fri Sep 12 11:33:37 2008
New Revision: 12233

Log:
* debian/changelog: Update.
* debian/sysconfig-hardware.postinst: Use new name.
* etc/udev/rules.d/65-sysconfig-hardware.rules: Remove.
* etc/udev/rules.d/65-sysconfig-hardware-net.rules,
  etc/udev/rules.d/85-sysconfig-hardware.rules: Add.


Added:
   people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware-net.rules
      - copied, changed from r12232, /people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware.rules
   people/waldi/s390/sysconfig/etc/udev/rules.d/85-sysconfig-hardware.rules
      - copied, changed from r12232, /people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware.rules
Removed:
   people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware.rules
Modified:
   people/waldi/s390/sysconfig/debian/changelog
   people/waldi/s390/sysconfig/debian/sysconfig-hardware.postinst

Modified: people/waldi/s390/sysconfig/debian/changelog
==============================================================================
--- people/waldi/s390/sysconfig/debian/changelog	(original)
+++ people/waldi/s390/sysconfig/debian/changelog	Fri Sep 12 11:33:37 2008
@@ -1,3 +1,10 @@
+sysconfig (0.0.8) UNRELEASED; urgency=low
+
+  * Split udev rules file. One part needs to run before the persistent rules,
+    one part after the driver loading.
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 12 Sep 2008 13:31:38 +0200
+
 sysconfig (0.0.7) unstable; urgency=medium
 
   * Move udev rules file. It provides more specific interface names than the

Modified: people/waldi/s390/sysconfig/debian/sysconfig-hardware.postinst
==============================================================================
--- people/waldi/s390/sysconfig/debian/sysconfig-hardware.postinst	(original)
+++ people/waldi/s390/sysconfig/debian/sysconfig-hardware.postinst	Fri Sep 12 11:33:37 2008
@@ -5,11 +5,11 @@
 case "$1" in
     configure)
         if [ -e "/etc/udev/sysconfig-hardware.rules" ]; then
-            echo "Preserving user changes to /etc/udev/rules.d/65-sysconfig-hardware.rules ..."
-            if [ -e "/etc/udev/rules.d/65-sysconfig-hardware.rules" ]; then
-                mv -f "/etc/udev/rules.d/65-sysconfig-hardware.rules" "/etc/udev/rules.d/65-sysconfig-hardware.rules.dpkg-new"
+            echo "Preserving user changes to /etc/udev/rules.d/85-sysconfig-hardware.rules ..."
+            if [ -e "/etc/udev/rules.d/85-sysconfig-hardware.rules" ]; then
+                mv -f "/etc/udev/rules.d/85-sysconfig-hardware.rules" "/etc/udev/rules.d/85-sysconfig-hardware.rules.dpkg-new"
             fi
-            mv -f "/etc/udev/sysconfig-hardware.rules" "/etc/udev/rules.d/65-sysconfig-hardware.rules"
+            mv -f "/etc/udev/sysconfig-hardware.rules" "/etc/udev/rules.d/85-sysconfig-hardware.rules"
         fi
         command -v update-initramfs >/dev/null 2>&1 && update-initramfs -u
     ;;

Copied: people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware-net.rules (from r12232, /people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware.rules)
==============================================================================
--- /people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware.rules	(original)
+++ people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware-net.rules	Fri Sep 12 11:33:37 2008
@@ -1,4 +1,2 @@
-SUBSYSTEM=="ccw", WAIT_FOR_SYSFS="online"
-SUBSYSTEM=="ccw", RUN+="/sbin/hwup -A -D $DEVPATH $env{SUBSYSTEM} %b"
 SUBSYSTEM=="net", IMPORT{program}="/etc/sysconfig/scripts/hardware/udev-net $env{PHYSDEVPATH}"
 SUBSYSTEM=="net", ENV{INTERFACE_NAME}=="?*", NAME="$env{INTERFACE_NAME}"

Copied: people/waldi/s390/sysconfig/etc/udev/rules.d/85-sysconfig-hardware.rules (from r12232, /people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware.rules)
==============================================================================
--- /people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware.rules	(original)
+++ people/waldi/s390/sysconfig/etc/udev/rules.d/85-sysconfig-hardware.rules	Fri Sep 12 11:33:37 2008
@@ -1,4 +1,2 @@
 SUBSYSTEM=="ccw", WAIT_FOR_SYSFS="online"
 SUBSYSTEM=="ccw", RUN+="/sbin/hwup -A -D $DEVPATH $env{SUBSYSTEM} %b"
-SUBSYSTEM=="net", IMPORT{program}="/etc/sysconfig/scripts/hardware/udev-net $env{PHYSDEVPATH}"
-SUBSYSTEM=="net", ENV{INTERFACE_NAME}=="?*", NAME="$env{INTERFACE_NAME}"