OK by me!
seems to work on for me too.
can you also bump to 0.6.10?
(that way we release it as that and it's consistent with svn?)
From: Guillaume Boudreau <guillaume.boudreau@...>
To: Carlos Puchol <cpg@...>
Cc: amahi-devel <amahi-devel@...>
Sent: Sat, June 26, 2010 3:28:13 PM
Subject: Re: greyhole patch to sleep if not "enabled" in options thus show "running" as daemon
I applied it, and changed some things:
1. Moved the print_usage, process_config and parse_options functions back into greyhole, since they are not shared. common.inc is the code shared between greyhole and greyhole-dfree (config parsing, helper functions, etc.) Since greyhole-dfree doesn't use / need those functions, they should be in greyhole.
2. Changed the check on $action == 'daemon' to file_exists('/usr/bin/hdactl') because I don't want the default for non-Amahi users, who also use the init script and thus the --daemon parameter, to be an infinite loop.
Would you prefer another check to verify that Amahi is installed?
Here's the reviewed patch:
On 2010-06-26, at 5:15 PM, Carlos Puchol wrote:
hi guillaume -
>here is a greyhole patch to sleep if it's not "enabled" in options thus showing "running" as daemon in the servers panel,
>see what you think.
>near as i could tell, the --daemon option was not really used - it was a fall-through, so it seemed like a logical choice to use.
>in addition, the initscript uses that option already, so it's kinda perfect, i think.
>i moved some code into include/common.php, as it seemed cleaner.
>Amahi - Making Home Networking Simple - http://www.amahi.org/