[zaptel-commits] tzafrir: trunk r1591 - in /trunk/xpp: ./ init_card_3_23 init_card_4_23

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Sat Nov 11 08:38:49 2006
New Revision: 1591

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1591
Log:
 r9497 at boole (orig r1590):  tzafrir | 2006-11-11 16:34:45 +0200
 init_card[34]_23: merge from 2654,2655.
  * Redirect stderr to /dev/null.
    Without any redirection, it may fail with exitval=4 .
    Probably, fd 2 is closed and the shell (or sed which is
    used in the scripts) tries to write to it (or do some other
    I/O related syscall) which fails.
  * make XPP_BASE handling identical in the two scripts.

Modified:
    trunk/xpp/   (props changed)
    trunk/xpp/init_card_3_23
    trunk/xpp/init_card_4_23

Propchange: trunk/xpp/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Nov 11 08:38:49 2006
@@ -1,3 +1,3 @@
 283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2600
-f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1571
+f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1590
 f558416c-6c06-0410-9f27-dde2687782d0:/team/tzafrir/xpp_1.2/xpp:1554

Modified: trunk/xpp/init_card_3_23
URL: http://svn.digium.com/view/zaptel/trunk/xpp/init_card_3_23?view=diff&rev=1591&r1=1590&r2=1591
==============================================================================
--- trunk/xpp/init_card_3_23 (original)
+++ trunk/xpp/init_card_3_23 Sat Nov 11 08:38:49 2006
@@ -42,12 +42,17 @@
 
 me=`basename $0`
 INIT_DIR=`dirname $0`
-export XPP_BASE=/proc/xpp
+XPP_BASE=/proc/xpp
+export XPP_BASE
 LOGGER="logger -s -t $me"
 
+# Always redirect stderr somewhere, otherwise the shell script will die
+# when it tries to do I/O related stuff on closed file descriptor.
+# Our default is to throw it down the bit-bucket.
+exec 2> /dev/null
 ## If you wish to trace this script:
 #exec 2> /tmp/xpp_init_$XPD_NAME
-## Altenativly, if you have multiple XPDs:
+## Altenativly, if you have multiple XBUS'es:
 #exec 2> /tmp/xpp_init_$XBUS_NAME_$XPD_NAME
 #set -x
 

Modified: trunk/xpp/init_card_4_23
URL: http://svn.digium.com/view/zaptel/trunk/xpp/init_card_4_23?view=diff&rev=1591&r1=1590&r2=1591
==============================================================================
--- trunk/xpp/init_card_4_23 (original)
+++ trunk/xpp/init_card_4_23 Sat Nov 11 08:38:49 2006
@@ -44,9 +44,13 @@
 export XPP_BASE
 LOGGER="logger -s -t $me"
 
+# Always redirect stderr somewhere, otherwise the shell script will die
+# when it tries to do I/O related stuff on closed file descriptor.
+# Our default is to throw it down the bit-bucket.
+exec 2> /dev/null
 ## If you wish to trace this script:
 #exec 2> /tmp/xpp_init_$XPD_NAME
-## Altenativly, if you have multiple XPDs:
+## Altenativly, if you have multiple XBUS'es:
 #exec 2> /tmp/xpp_init_$XBUS_NAME_$XPD_NAME
 #set -x