Bug 577: improved trap handling

diff --git a/CHANGES b/CHANGES
index a3a1c5488e169f0261e10fa38f70167641b1aa99..3c662856d82ab7718d9166bc85cc9007c9b0a755 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX 4.2.1
 
+* improve trap handling in faxaddmodem/probemodem (17 Dec 2004)
 * fix hfaxd from rejecting jobs scheduled for the past while
   the killtime is still in the future (15 Dec 2004)
 * drop ftp links from received notification e-mail (8 Dec 2004)

diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in
index 490540f5ba80b904991b67ea5ad8fc5265fef934..802746dbbf7cd29ecb0b89a4e6f332e331f33a86 100644 (file)
--- a/etc/faxaddmodem.sh.in
+++ b/etc/faxaddmodem.sh.in
@@ -867,7 +867,7 @@ while [ -z "$RESULT" ]; do
     # reset the modem.  If something goes wrong, it'll
     # nag the user to check on the problem.
     #
-    (trap 0 1 2 15;
+    (trap "exit 1" 1 2 15;
      while true; do
        sleep 10;
        echo ""

diff --git a/etc/probemodem.sh.in b/etc/probemodem.sh.in
index ac274182fec49e6b627226e0399ab0cedf927945..cf9b4d7ef12b56f91d2e994cd4464144209467b5 100644 (file)
--- a/etc/probemodem.sh.in
+++ b/etc/probemodem.sh.in
@@ -263,7 +263,7 @@ while [ -z "$RESULT" ]; do
     # reset the modem.  If something goes wrong, it'll
     # nag the user to check on the problem.
     #
-    (trap 0 1 2 15;
+    (trap "exit 1" 1 2 15;
      while true; do
        sleep 10;
        echo ""