| rc.subr (206248) | rc.subr (206686) |
|---|---|
| 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 206248 2010-04-06 05:20:46Z dougb $ | 2# $FreeBSD: head/etc/rc.subr 206686 2010-04-15 21:18:24Z dougb $ |
| 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 --- 630 unchanged lines hidden (view full) --- 641 fi 642 643 eval $_pidcmd # determine the pid if necessary 644 645 for _elem in $_keywords; do 646 if [ "$_elem" != "$rc_arg" ]; then 647 continue 648 fi | 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 --- 630 unchanged lines hidden (view full) --- 641 fi 642 643 eval $_pidcmd # determine the pid if necessary 644 645 for _elem in $_keywords; do 646 if [ "$_elem" != "$rc_arg" ]; then 647 continue 648 fi |
| 649 # if ${rcvar} is set, and $1 is not 650 # "rcvar", then run | 649 # if ${rcvar} is set, $1 is not "rcvar" 650 # and ${rc_pid} is not set, then run |
| 651 # checkyesno ${rcvar} 652 # and return if that failed 653 # | 651 # checkyesno ${rcvar} 652 # and return if that failed 653 # |
| 654 if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then | 654 if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a -z "${rc_pid}" ]; then |
| 655 if ! checkyesno ${rcvar}; then 656 if [ -n "${rc_quiet}" ]; then 657 return 0 658 fi 659 echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " 660 echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " 661 echo "instead of '${rc_arg}'." 662 return 0 --- 1051 unchanged lines hidden --- | 655 if ! checkyesno ${rcvar}; then 656 if [ -n "${rc_quiet}" ]; then 657 return 0 658 fi 659 echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " 660 echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " 661 echo "instead of '${rc_arg}'." 662 return 0 --- 1051 unchanged lines hidden --- |