From c6456ba7d385c97ab2d34f3d72d9fc4207b03646 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Sun, 30 Sep 2018 19:07:50 -0500 Subject: [PATCH] Modified init-functions so that pidofproc properly returns non-zero --- Makefile | 2 +- SRC/initscripts/init-functions | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 54eff86..33604e0 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ DESC = This package supplies the core required init scripts for startup ARCHIVE := '' SRCDIR := $(PWD)/SRC/initscripts PATCHDIR := $(PWD)/SRC/patches -VERSION := 1.9-1 +VERSION := 1.10-0 include /usr/share/snap/Makefile.snaplinux diff --git a/SRC/initscripts/init-functions b/SRC/initscripts/init-functions index 68ccaa4..8f4ea5d 100755 --- a/SRC/initscripts/init-functions +++ b/SRC/initscripts/init-functions @@ -117,7 +117,9 @@ pidofproc() { esac done - if [ -r "$pidfile" ]; then + if [ -n "$pidfile" ] && [ ! -r "$pidfile" ]; then + return 1 + elif [ -n "$pidfile" ]; then pids=$(head -1 $pidfile|sed 's/ \+//g') else pids=$(pidof "$pathname")