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

[Bastian Blank]

Author: waldi
Date: Sat Oct 30 14:31:51 2010
New Revision: 16512

Log:
Fix path-less source of scripts.

* debian/changelog: Update.
* etc/sysconfig/scripts/hardware/functions: Don't append to PATH.
* etc/sysconfig/scripts/hardware/hwup, etc/sysconfig/scripts/hardware/hwup-ccw:
  Use complete path for source.

Modified:
   people/waldi/s390/sysconfig/debian/changelog
   people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/functions
   people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup
   people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup-ccw

Modified: people/waldi/s390/sysconfig/debian/changelog
==============================================================================
--- people/waldi/s390/sysconfig/debian/changelog	Sat Oct 30 10:25:35 2010	(r16511)
+++ people/waldi/s390/sysconfig/debian/changelog	Sat Oct 30 14:31:51 2010	(r16512)
@@ -1,6 +1,7 @@
 sysconfig (0.0.10) UNRELEASED; urgency=medium
 
   * Move udev rules files.
+  * Fix path-less source of script files. (closes: #600135)
 
  -- Bastian Blank <waldi at debian.org>  Fri, 09 Oct 2009 15:17:18 +0200
 

Modified: people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/functions
==============================================================================
--- people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/functions	Sat Oct 30 10:25:35 2010	(r16511)
+++ people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/functions	Sat Oct 30 14:31:51 2010	(r16512)
@@ -4,8 +4,6 @@
 
   . ${SYSCONFIG}/scripts/common/functions
 
-  PATH="$PATH:${SYSCONFIG}/scripts/hardware"
-
   MODE=manual
 
   while getopts ":AD:h" OPT; do

Modified: people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup
==============================================================================
--- people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup	Sat Oct 30 10:25:35 2010	(r16511)
+++ people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup	Sat Oct 30 14:31:51 2010	(r16512)
@@ -34,4 +34,4 @@
   exit $R_ERROR
 esac
 
-source $COMMAND-$BUS $ID $DEVPATH
+source $SYSCONFIG/scripts/hardware/$COMMAND-$BUS $ID $DEVPATH

Modified: people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup-ccw
==============================================================================
--- people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup-ccw	Sat Oct 30 10:25:35 2010	(r16511)
+++ people/waldi/s390/sysconfig/etc/sysconfig/scripts/hardware/hwup-ccw	Sat Oct 30 14:31:51 2010	(r16512)
@@ -62,10 +62,10 @@
 [ -z "$name" ] && error "Invalid device type (cu ${cutype} dev ${devtype}"
 
 if [ "$name" = cu3088 ] || [ "$name" = qeth ]; then
-  source $COMMAND-ccw-group "$ID" "$name"
+  source $SYSCONFIG/scripts/hardware/$COMMAND-ccw-group "$ID" "$name"
 elif [ "$name" = zfcp ]; then
-  source $COMMAND-ccw-zfcp "$ID"
+  source $SYSCONFIG/scripts/hardware/$COMMAND-ccw-zfcp "$ID"
 elif [ "$name" = dasd-eckd ] || [ "$name" = dasd-fba ]; then
-  source $COMMAND-ccw-dasd "$ID"
+  source $SYSCONFIG/scripts/hardware/$COMMAND-ccw-dasd "$ID"
 fi