--- avahi-0.6.17/initscript/fedora/avahi-daemon.in.exitcode	2006-02-12 12:39:15.000000000 +0100
+++ avahi-0.6.17/initscript/fedora/avahi-daemon.in	2007-03-14 12:12:37.000000000 +0100
@@ -80,7 +80,9 @@
 	;;
   status)
         $AVAHI_BIN -c
-	[ $? = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running"
+    RETVAL=$?
+    [ $RETVAL = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running"
+
 	;;
   restart)
 	restart
@@ -98,5 +100,5 @@
 	exit 1
 esac
 
-exit $?
+exit $RETVAL
 
--- avahi-0.6.17/initscript/fedora/avahi-dnsconfd.in.exitcode	2007-03-14 12:07:38.000000000 +0100
+++ avahi-0.6.17/initscript/fedora/avahi-dnsconfd.in	2007-03-14 12:12:36.000000000 +0100
@@ -76,7 +76,9 @@
 	;;
   status)
         $AVAHI_BIN -c
-	[ $? = 0 ] && echo $"Avahi DNS daemon is running" || echo $"Avahi DNS daemon is not running"
+	RETVAL=$?
+    [ $RETVAL = 0 ] && echo $"Avahi DNS daemon is running" || echo $"Avahi DNS daemon is not running"
+
 	;;
   restart)
 	restart
@@ -95,5 +97,5 @@
 	;;
 esac
 
-exit $?
+exit $RETVAL