aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--initscripts.spec5
-rwxr-xr-xrc.d/init.d/functions4
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 29c82d21..26d5759a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1999-04-07 Bill Nottingham <notting@redhat.com>
+ * rc.d/init.d/functions:
+ add a --check to daemon so that we don't look for su's pid
+
* rc.d/rc.sysinit: touch wtmp, don't zero it
* sysconfig/network-scripts/ifup: fix check for non-existent devices
diff --git a/initscripts.spec b/initscripts.spec
index f3a3964f..9eb77320 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/rc.d scripts.
Name: initscripts
-%define version 4.00
+%define version 4.01
Version: %{version}
Copyright: GPL
Group: System Environment/Base
@@ -181,6 +181,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 07 1999 Bill Nottingham <notting@redhat.com>
+- fix daemon() function so you can specify pid to look for
+
* Wed Apr 07 1999 Erik Troan <ewt@redhat.com>
- changed utmp,wtmp to be group writeable and owned by group utmp
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 6d6bb4d5..222cdbe7 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -43,12 +43,14 @@ fi
# A function to start a program.
daemon() {
# Test syntax.
+ gotbase=
case $1 in
'') echo '$0: Usage: daemon [+/-nicelevel] {program}'
return 1;;
--check)
shift
base=$1
+ gotbase="yes"
shift;;
-*|+*) nicelevel=$1
@@ -57,7 +59,7 @@ daemon() {
esac
# Save basename.
- [ -z $base ] && base=`basename $1`
+ [ -z $gotbase ] && base=`basename $1`
# See if it's already running.
pid=`pidofproc $base`