diff mbox

[3/3] start-statd: Use the canonical to check if systemd is running.

Message ID 1421181457-8159-4-git-send-email-steved@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Steve Dickson Jan. 13, 2015, 8:37 p.m. UTC
Use the approved way, define in
   http://www.freedesktop.org/software/systemd/man/sd_booted.html

to check if systemd is installed and running

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 utils/statd/start-statd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

J. Bruce Fields Jan. 15, 2015, 7:36 p.m. UTC | #1
On Tue, Jan 13, 2015 at 03:37:37PM -0500, Steve Dickson wrote:
> Use the approved way, define in
>    http://www.freedesktop.org/software/systemd/man/sd_booted.html
> 
> to check if systemd is installed and running
> 
> Signed-off-by: Steve Dickson <steved@redhat.com>
> ---
>  utils/statd/start-statd | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/utils/statd/start-statd b/utils/statd/start-statd
> index ec9383b..b32b3a5 100755
> --- a/utils/statd/start-statd
> +++ b/utils/statd/start-statd
> @@ -7,7 +7,7 @@
>  PATH="/sbin:/usr/sbin:/bin:/usr/bin"
>  
>  # First try systemd if it's installed.
> -if systemctl --help >/dev/null 2>&1; then
> +if test -d /run/systemd/system; then
>      # Quit only if the call worked.
>      systemctl start rpc-statd.service && exit
>  fi

In the case systemctl start fails it then falls back on 

   exec rpc.statd --no-notify

which is kind of unexpected.  It's going to be confusing having this
hand-started statd on a systemd distro.  Better just to fail cleanly.

So that "&& exit" should just be "; exit".

--b.

> -- 
> 2.1.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/utils/statd/start-statd b/utils/statd/start-statd
index ec9383b..b32b3a5 100755
--- a/utils/statd/start-statd
+++ b/utils/statd/start-statd
@@ -7,7 +7,7 @@ 
 PATH="/sbin:/usr/sbin:/bin:/usr/bin"
 
 # First try systemd if it's installed.
-if systemctl --help >/dev/null 2>&1; then
+if test -d /run/systemd/system; then
     # Quit only if the call worked.
     systemctl start rpc-statd.service && exit
 fi