Module Name: src
Committed By: prlw1
Date: Tue Dec 4 16:38:40 UTC 2012
Modified Files:
src/etc/rc.d: ntpd ppp
Log Message:
Make sure that ntpd creates a pid file for the rc machinery to work.
http://mail-index.netbsd.org/current-users/2012/11/19/msg021518.html
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/etc/rc.d/ntpd
cvs rdiff -u -r1.8 -r1.9 src/etc/rc.d/ppp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ntpd
diff -u src/etc/rc.d/ntpd:1.13 src/etc/rc.d/ntpd:1.14
--- src/etc/rc.d/ntpd:1.13 Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/ntpd Tue Dec 4 16:38:40 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ntpd,v 1.13 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: ntpd,v 1.14 2012/12/04 16:38:40 prlw1 Exp $
#
# PROVIDE: ntpd
@@ -19,6 +19,7 @@ required_files="/etc/ntp.conf"
ntpd_precmd()
{
+ rc_flags="-p ${pidfile} $rc_flags"
if [ -z "$ntpd_chrootdir" ]; then
return 0;
fi
Index: src/etc/rc.d/ppp
diff -u src/etc/rc.d/ppp:1.8 src/etc/rc.d/ppp:1.9
--- src/etc/rc.d/ppp:1.8 Mon Oct 11 15:00:51 2004
+++ src/etc/rc.d/ppp Tue Dec 4 16:38:40 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ppp,v 1.8 2004/10/11 15:00:51 christos Exp $
+# $NetBSD: ppp,v 1.9 2012/12/04 16:38:40 prlw1 Exp $
#
# PROVIDE: ppp
@@ -14,6 +14,7 @@
$_rc_subr_loaded . /etc/rc.subr
name="ppp"
+rcvar=$name
start_cmd="ppp_start"
stop_cmd="ppp_stop"
sig_stop="-INT"
@@ -40,6 +41,8 @@ ppp_start()
fi
done
echo "."
+ else
+ warn "\${ppp_peers} is not set - pppd was not started."
fi
}
