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

[Bastian Blank]

Author: waldi
Date: Fri Sep 12 10:26:45 2008
New Revision: 12231

Log:
* debian/changelog: Update.
* debian/sysconfig-hardware.postinst,
  debian/sysconfig-hardware.preinst: Preserve udev rules changes.
* debian/sysconfig-hardware.postrm: Remove.
* etc/udev/rules.d: New directory.
* etc/udev/rules.d/65-sysconfig-hardware.rules:
  Move from etc/udev/sysconfig-hardware.rules.


Added:
   people/waldi/s390/sysconfig/debian/sysconfig-hardware.preinst
   people/waldi/s390/sysconfig/etc/udev/rules.d/
   people/waldi/s390/sysconfig/etc/udev/rules.d/65-sysconfig-hardware.rules   (props changed)
      - copied unchanged from r11843, /people/waldi/s390/sysconfig/etc/udev/sysconfig-hardware.rules
Removed:
   people/waldi/s390/sysconfig/debian/sysconfig-hardware.postrm
   people/waldi/s390/sysconfig/etc/udev/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 10:26:45 2008
@@ -1,3 +1,10 @@
+sysconfig (0.0.7) UNRELEASED; urgency=low
+
+  * Move udev rules file. It provides more specific interface names than the
+    udev provided rules.
+
+ -- Bastian Blank <waldi at debian.org>  Wed, 16 Jul 2008 10:27:11 +0200
+
 sysconfig (0.0.6) unstable; urgency=medium
 
   * Ignore not support qeth options. Needed for 2.6.26.

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 10:26:45 2008
@@ -4,8 +4,12 @@
 
 case "$1" in
     configure)
-        if [ -z "$2" ]; then
-            ln -sf ../sysconfig-hardware.rules /etc/udev/rules.d/z60_sysconfig-hardware.rules
+        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"
+            fi
+            mv -f "/etc/udev/sysconfig-hardware.rules" "/etc/udev/rules.d/65-sysconfig-hardware.rules"
         fi
         command -v update-initramfs >/dev/null 2>&1 && update-initramfs -u
     ;;

Added: people/waldi/s390/sysconfig/debian/sysconfig-hardware.preinst
==============================================================================
--- (empty file)
+++ people/waldi/s390/sysconfig/debian/sysconfig-hardware.preinst	Fri Sep 12 10:26:45 2008
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    install|upgrade)
+        if [ -e "/etc/udev/sysconfig-hardware.rules" ]; then
+            if [ "$(md5sum "/etc/udev/sysconfig-hardware.rules" | sed -e "s/ .*//")" = \
+                 "$(dpkg-query -W -f='${Conffiles}' sysconfig-hardware | sed -n -e "\\' /etc/udev/sysconfig-hardware.rules's/.* //p")" ]
+            then
+                rm -f "/etc/udev/sysconfig-hardware.rules"
+            fi
+        fi
+        if [ -L "/etc/udev/rules.d/z60_sysconfig-hardware.rules" ]; then
+            rm -f "/etc/udev/rules.d/z60_sysconfig-hardware.rules"
+        fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+