Deleted Added
full compact
rc.subr (290007) rc.subr (291770)
1# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
1# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
2# $FreeBSD: head/etc/rc.subr 290007 2015-10-26 15:14:55Z des $
2# $FreeBSD: head/etc/rc.subr 291770 2015-12-04 16:32:29Z jilles $
3#
4# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
5# All rights reserved.
6#
7# This code is derived from software contributed to The NetBSD Foundation
8# by Luke Mewburn.
9#
10# Redistribution and use in source and binary forms, with or without

--- 960 unchanged lines hidden (view full) ---

971 fi
972 echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to "
973 echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' "
974 echo "instead of '${rc_arg}'."
975 return 0
976 fi
977 fi
978
3#
4# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
5# All rights reserved.
6#
7# This code is derived from software contributed to The NetBSD Foundation
8# by Luke Mewburn.
9#
10# Redistribution and use in source and binary forms, with or without

--- 960 unchanged lines hidden (view full) ---

971 fi
972 echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to "
973 echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' "
974 echo "instead of '${rc_arg}'."
975 return 0
976 fi
977 fi
978
979 if [ $rc_arg = "start" -a -z "$rc_fast" -a -n "$rc_pid" ]; then
980 if [ -z "$rc_quiet" ]; then
981 echo 1>&2 "${name} already running? " \
982 "(pid=$rc_pid)."
983 fi
984 return 1
985 fi
986
979 # if there's a custom ${XXX_cmd},
980 # run that instead of the default
981 #
982 eval _cmd=\$${rc_arg}_cmd \
983 _precmd=\$${rc_arg}_precmd \
984 _postcmd=\$${rc_arg}_postcmd
985
986 if [ -n "$_cmd" ]; then

--- 12 unchanged lines hidden (view full) ---

999 else
1000 echo "${name} is not running."
1001 return 1
1002 fi
1003 _run_rc_postcmd
1004 ;;
1005
1006 start)
987 # if there's a custom ${XXX_cmd},
988 # run that instead of the default
989 #
990 eval _cmd=\$${rc_arg}_cmd \
991 _precmd=\$${rc_arg}_precmd \
992 _postcmd=\$${rc_arg}_postcmd
993
994 if [ -n "$_cmd" ]; then

--- 12 unchanged lines hidden (view full) ---

1007 else
1008 echo "${name} is not running."
1009 return 1
1010 fi
1011 _run_rc_postcmd
1012 ;;
1013
1014 start)
1007 if [ -z "$rc_fast" -a -n "$rc_pid" ]; then
1008 if [ -z "$rc_quiet" ]; then
1009 echo 1>&2 "${name} already running? " \
1010 "(pid=$rc_pid)."
1011 fi
1012 return 1
1013 fi
1014
1015 if [ ! -x "${_chroot}${_chroot:+/}${command}" ]; then
1016 warn "run_rc_command: cannot run $command"
1017 return 1
1018 fi
1019
1020 if ! _run_rc_precmd; then
1021 warn "failed precmd routine for ${name}"
1022 return 1

--- 1078 unchanged lines hidden ---
1015 if [ ! -x "${_chroot}${_chroot:+/}${command}" ]; then
1016 warn "run_rc_command: cannot run $command"
1017 return 1
1018 fi
1019
1020 if ! _run_rc_precmd; then
1021 warn "failed precmd routine for ${name}"
1022 return 1

--- 1078 unchanged lines hidden ---