Steve Langasek [2009-11-02 11:06 -0000]: > > > + [ -e "/etc/eucalyptus/avahi-daemon.conf" ] && opts="${opts} -f /etc/eucalyptus/avahi-daemon.conf" > > > Upstart scripts are "set -e" by default, so you are missing an "|| > > true" here. > > $ set -e > $ [ -e "/etc/eucalyptus/avahi-daemon.conf" ] && opts="${opts} -f /etc/eucalyptus/avahi-daemon.conf" > $ echo $? > 1
(thanks for the confirmation)
> > > -exec avahi-daemon -D > > > + [ -e "/etc/eucalyptus/avahi-daemon.conf" ] && conf="-f /etc/eucalyptus/avahi-daemon.conf" || : > > > + exec avahi-daemon -D $conf > > > +end script > > That doesn't appear to drop the -D at all? I guess maybe you mean:
No, it shouldn't. -D means "daemonize", and this should always be done. What we want to do is to add -f /my/different/conffile.
> script > conf=-D > [ -e "/etc/eucalyptus/avahi-daemon.conf" ] && conf="-f /etc/eucalyptus/avahi-daemon.conf" > exec avahi-daemon $conf > end script
That would start avahi-daemon in non-daemon mode for euca; this might work with upstart (haven't checked), but I advise against making such changes in an SRU.
Martin
-- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
Steve Langasek [2009-11-02 11:06 -0000]: s/avahi- daemon. conf" ] && opts="${opts} -f /etc/eucalyptus /avahi- daemon. conf" s/avahi- daemon. conf" ] && opts="${opts} -f /etc/eucalyptus /avahi- daemon. conf"
> > > + [ -e "/etc/eucalyptu
>
> > Upstart scripts are "set -e" by default, so you are missing an "||
> > true" here.
>
> $ set -e
> $ [ -e "/etc/eucalyptu
> $ echo $?
> 1
(thanks for the confirmation)
> > > -exec avahi-daemon -D s/avahi- daemon. conf" ] && conf="-f /etc/eucalyptus /avahi- daemon. conf" || :
> > > + [ -e "/etc/eucalyptu
> > > + exec avahi-daemon -D $conf
> > > +end script
>
> That doesn't appear to drop the -D at all? I guess maybe you mean:
No, it shouldn't. -D means "daemonize", and this should always be conffile.
done. What we want to do is to add -f /my/different/
> script s/avahi- daemon. conf" ] && conf="-f /etc/eucalyptus /avahi- daemon. conf"
> conf=-D
> [ -e "/etc/eucalyptu
> exec avahi-daemon $conf
> end script
That would start avahi-daemon in non-daemon mode for euca; this might
work with upstart (haven't checked), but I advise against making such
changes in an SRU.
Martin
-- www.piware. de
Martin Pitt | http://
Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)