Comment 24 for bug 458904

> checking the return value with '&&' is sufficient to prevent the shell from exiting under set -e

Ah, thanks for pointing out.

> if /etc/eucalyptus/avahi-daemon.conf does not exist, you need to drop
> -D entirely (to use the default file).

Sorry, that was BS, ignore me.

So the original patch in comment 19 is just fine.