Silence pointless stty errors when running faxaddmodem on linux.

Contributed by Tim Rice <tim@trr.metro.net>.

diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in
index 846c0038a8a9fd5499386e7be3924ad84df30b8b..5fe3477832003a0a128d9a4d4acfc3f40cef311f 100644 (file)
--- a/etc/faxaddmodem.sh.in
+++ b/etc/faxaddmodem.sh.in
@@ -770,7 +770,10 @@ SendToModem()
 {
     COMMAND=$*
     sleep 1                                    # wait for previous kill
-    onDev $STTY 0; sleep 1                     # reset the modem (hopefully)
+    case $TARGET in
+    *-linux*)  ;;
+    *) onDev $STTY 0; sleep 1  ;;              # reset the modem (hopefully)
+    esac
                                                # start listening for output
     onDev -c "$STTY clocal && exec $CAT $tdev"; sleep 2
     #

diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
index 9071073a6f8830c315fb2bbcd672d60f75ce2dd8..9c4dcafa994eed1528bbb4011bd3ef497d6bcae0 100644 (file)
--- a/etc/faxsetup.sh.in
+++ b/etc/faxsetup.sh.in
@@ -152,6 +152,7 @@ SENDMAIL    PATH_SENDMAIL
 SPOOL          DIR_SPOOL
 SYSVINIT
 TIFFBIN
+TARGET
 UUCP_LOCKDIR   DIR_LOCKS
 UUCP_LOCKTYPE  LOCKS"
 
@@ -433,7 +434,7 @@ if onServer; then
     elif [ -f /etc/pwconv ]; then      # could be a SCO box
        addPasswd()
        {
-           echo "${1}:NOLOGIN:${2}:${3}:Facsimile Agent:${4}:" >> ${PASSWD}
+           echo "${1}:NOLOGIN:${2}:${3}:Facsimile Agent:${4}:/bin/false" >> ${PASSWD}
            /etc/pwconv
        }
        lockPasswd()