Add a timeout on winexe call so the pre-backup commands cannot hang indefinitely. The version of timeout is only included on RHEL 5 because in EL6, coreutils provides one

BackupPC-server-scripts.spec

@@ -35,7 +35,13 @@ Like pre-backup scripts for Windows boxes
 
 # Install backup script
 %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}/
-%{__install} -m 0755 scripts/* $RPM_BUILD_ROOT%{_bindir}/
+%{__install} -m 0755 scripts/win-* $RPM_BUILD_ROOT%{_bindir}/
+
+# coreutils doesn't provides a timeout command in EL5
+# So include the bash one
+%if 0%{?rhel} == 5
+%{__install} -m 0755 scripts/timeout $RPM_BUILD_ROOT%{_bindir}/
+%endif
 
 # Install conf
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/BackupPC

scripts/timeout

@@ -0,0 +1,53 @@
+#Newsgroups: comp.unix.admin,comp.unix.solaris,comp.unix.shell
+#From: gwc@root.co.uk (Geoff Clare)
+#Subject: Re: timeout -t <sec> <unix command> (Re: How to give rsh a shorter timeout?)
+#Message-ID: <EoBxrs.223@root.co.uk>
+#Date: Fri, 13 Feb 1998 18:23:52 GMT
+
+#
+# Conversion to bash v2 syntax done by Chet Ramey <chet@po.cwru.edu
+# UNTESTED
+#
+
+prog=${0##*/}
+usage="usage: $prog [-signal] [timeout] [:interval] [+delay] [--] <command>"
+
+SIG=-TERM       # default signal sent to the process when the timer expires
+timeout=60      # default timeout
+interval=15     # default interval between checks if the process is still alive
+delay=2         # default delay between posting the given signal and
+                # destroying the process (kill -KILL)
+
+while :
+do
+        case $1 in
+        --)     shift; break ;;
+        -*)     SIG=$1 ;;
+        [0-9]*) timeout=$1 ;;
+        :*)     EXPR='..\(.*\)' ; interval=`expr x"$1" : "$EXPR"` ;;
+        +*)     EXPR='..\(.*\)' ; delay=`expr x"$1" : "$EXPR"` ;;
+        *)      break ;;
+        esac
+        shift
+done
+
+case $# in
+0)      echo "$prog: $usage" >&2 ; exit 2 ;;
+esac
+
+(
+        for t in $timeout $delay
+        do
+                while (( $t > $interval ))
+                do
+                        sleep $interval
+                        kill -0 $$ || exit
+                        t=$(( $t - $interval ))
+                done
+                sleep $t
+                kill $SIG $$ && kill -0 $$ || exit
+                SIG=-KILL
+        done
+) 2> /dev/null &
+
+exec "$@"

scripts/win-post-backup

@@ -9,11 +9,14 @@ if [ ! -z $3 ]; then
     PASS=$3
 fi
 
+# Timeout after 5 minutes
+TIMEOUT=300
+
 BOX=$1
 
 if [[ ! -z $UNAME && ! -z $PASS ]]; then
-    $WINEXE -s /dev/null -U $UNAME --password=$PASS //$BOX 'cmd /c echo '1' > c:\backuppc\wake.up' <&-
+    /usr/bin/timeout $TIMEOUT $WINEXE -s /dev/null -U $UNAME --password=$PASS //$BOX 'cmd /c echo '1' > c:\backuppc\wake.up' <&-
 else
-    $WINEXE -s /dev/null --authentication-file=/etc/BackupPC/win.conf //$BOX 'cmd /c echo '1' > c:\backuppc\wake.up' <&-
+    /usr/bin/timeout $TIMEOUT $WINEXE -s /dev/null --authentication-file=/etc/BackupPC/win.conf //$BOX 'cmd /c echo '1' > c:\backuppc\wake.up' <&-
 fi
 echo "Rsync and shadow copy unloaded"

scripts/win-pre-backup

@@ -7,12 +7,15 @@ if [ ! -z $3 ]; then
     PASS=$3
 fi
 
+# Timeout after 5 minutes
+TIMEOUT=300
+
 BOX=$1
 
 if [[ ! -z $UNAME && ! -z $PASS ]]; then
-    /usr/bin/winexe -s /dev/null --interactive=0 -U $UNAME --password=$PASS //$BOX 'cmd /c c:\backuppc\pre-exec.cmd' <&- || exit 255
+    /usr/bin/timeout $TIMEOUT /usr/bin/winexe -s /dev/null --interactive=0 -U $UNAME --password=$PASS //$BOX 'cmd /c c:\backuppc\pre-exec.cmd' <&- || exit 255
 else
-    /usr/bin/winexe -s /dev/null --interactive=0 --authentication-file=/etc/BackupPC/win.conf //$BOX 'cmd /c c:\backuppc\pre-exec.cmd' <&- || exit 255
+    /usr/bin/timeout $TIMEOUT /usr/bin/winexe -s /dev/null --interactive=0 --authentication-file=/etc/BackupPC/win.conf //$BOX 'cmd /c c:\backuppc\pre-exec.cmd' <&- || exit 255
 fi
 sleep 5
 echo "Rsync and shadow copy loaded"