[kernel] r16094 - in people/waldi/s390/sysconfig: debian etc/sysconfig/scripts/hardware

[Bastian Blank]

Author: waldi
Date: Fri Aug  6 15:08:17 2010
New Revision: 16094

Log:
Import non-maintainer upload (0.0.9+nmu2).

Modified:
   people/waldi/s390/sysconfig/debian/changelog
   people/waldi/s390/sysconfig/debian/compat
   people/waldi/s390/sysconfig/debian/control
   people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup-ccw-group
   people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/udev-net

Modified: people/waldi/s390/sysconfig/debian/changelog
==============================================================================
--- people/waldi/s390/sysconfig/debian/changelog	Fri Aug  6 15:06:10 2010	(r16093)
+++ people/waldi/s390/sysconfig/debian/changelog	Fri Aug  6 15:08:17 2010	(r16094)
@@ -1,10 +1,30 @@
 sysconfig (0.0.10) UNRELEASED; urgency=medium
 
-  * Use bash as shell. (closes: #538354, RC bugfix)
   * Move udev rules files.
 
  -- Bastian Blank <waldi at debian.org>  Fri, 09 Oct 2009 15:17:18 +0200
 
+sysconfig (0.0.9+nmu2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Allow for driver name change in sysfs for CTC network devices in Linux
+    kernel 2.6.33. Closes: #566632.
+  * Correct variable use in hwup-ccw-group script. Closes: #566635.
+  * Also set buffer and protocol options both for the (old) ctc module and
+    the (current) ctcm modules. Closes: #566629.
+
+ -- Frans Pop <fjp at debian.org>  Thu, 29 Apr 2010 10:50:24 +0200
+
+sysconfig (0.0.9+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use bash as shell for hwup and hwdown. Closes: #523178.
+  * udev-net: quote variable to avoid syntax errors if it's empty.
+    Closes: #523178.
+  * Increase debhelper compatibility to 5.
+
+ -- Frans Pop <fjp at debian.org>  Wed, 02 Dec 2009 02:00:15 +0100
+
 sysconfig (0.0.9) unstable; urgency=low
 
   * Don't use the deprecated PHYSDEVPATH interface.

Modified: people/waldi/s390/sysconfig/debian/compat
==============================================================================
--- people/waldi/s390/sysconfig/debian/compat	Fri Aug  6 15:06:10 2010	(r16093)
+++ people/waldi/s390/sysconfig/debian/compat	Fri Aug  6 15:08:17 2010	(r16094)
@@ -1 +1 @@
-4
+5

Modified: people/waldi/s390/sysconfig/debian/control
==============================================================================
--- people/waldi/s390/sysconfig/debian/control	Fri Aug  6 15:06:10 2010	(r16093)
+++ people/waldi/s390/sysconfig/debian/control	Fri Aug  6 15:08:17 2010	(r16094)
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 5.0.0)
 Standards-Version: 3.6.2
 
 Package: sysconfig-hardware

Modified: people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup-ccw-group
==============================================================================
--- people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup-ccw-group	Fri Aug  6 15:06:10 2010	(r16093)
+++ people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup-ccw-group	Fri Aug  6 15:08:17 2010	(r16094)
@@ -15,7 +15,7 @@
 
 CCWGROUP_ID=$CCWGROUP_CHANS
 
-if [ "$name" == cu3088 ]; then
+if [ "$NAME" == cu3088 ]; then
   modprobe ctcm 2> /dev/null || :
   modprobe ctc 2> /dev/null || :
 
@@ -26,7 +26,7 @@
   else
     error "no kernel module for ctc devices available!"
   fi
-elif [ "$name" == qeth ]; then
+elif [ "$NAME" == qeth ]; then
   modprobe qeth 2> /dev/null || :
 
   if [ -d $SYSFS/module/qeth ]; then
@@ -36,7 +36,7 @@
   fi
 fi
 
-ccw=/bus/ccw/drivers/$NAME
+ccw=/bus/ccw/devices/$ID/driver
 ccwgroup=/bus/ccwgroup/drivers/$DRIVER
 
 message_n "Configuring device $ID: "
@@ -95,16 +95,19 @@
   fi
 }
 
-if [ "$DRIVER" = ctc ]; then
-  write_setting "buffer" "$CTC_BUFFER"
-  write_setting "protocol" "$CTC_PROTOCOL"
-elif [ "$DRIVER" = qeth ]; then
-  write_setting "portname" "$QETH_PORTNAME"
-  write_setting "portno" "$QETH_PORTNO"
-  write_option "fake_broadcast" "${QETH_OPTIONS[@]}"
-  write_option "fake_ll" "${QETH_OPTIONS[@]}"
-  write_option "layer2" "${QETH_OPTIONS[@]}"
-fi
+case $DRIVER in
+  ctc|ctcm)
+    write_setting "buffer" "$CTC_BUFFER"
+    write_setting "protocol" "$CTC_PROTOCOL"
+    ;;
+  qeth)
+    write_setting "portname" "$QETH_PORTNAME"
+    write_setting "portno" "$QETH_PORTNO"
+    write_option "fake_broadcast" "${QETH_OPTIONS[@]}"
+    write_option "fake_ll" "${QETH_OPTIONS[@]}"
+    write_option "layer2" "${QETH_OPTIONS[@]}"
+    ;;
+esac
 
 echo 1 > $SYSFS$ccwgroup/$CCWGROUP_ID/online
 message "ok."

Modified: people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/udev-net
==============================================================================
--- people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/udev-net	Fri Aug  6 15:06:10 2010	(r16093)
+++ people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/udev-net	Fri Aug  6 15:08:17 2010	(r16094)
@@ -11,7 +11,7 @@
 ID=$(readlink /sys/$DEVPATH/device | sed -e 's,.*/,,')
 BUS=$(readlink /sys/$DEVPATH/device/subsystem | sed -e 's,.*/,,')
 
-[ $BUS = "ccwgroup" ] && BUS=ccw
+[ "$BUS" = ccwgroup ] && BUS=ccw
 
 read_config $BUS $ID