diff --git a/de_DE.ISO8859-1/books/handbook/config/chapter.sgml b/de_DE.ISO8859-1/books/handbook/config/chapter.sgml index 668baa11c7..d735a52b04 100644 --- a/de_DE.ISO8859-1/books/handbook/config/chapter.sgml +++ b/de_DE.ISO8859-1/books/handbook/config/chapter.sgml @@ -410,11 +410,11 @@ ifconfig_fxp0="inet 10.1.1.1/8"</programlisting></listitem> # REQUIRE: DAEMON # KEYWORD: shutdown - ./etc/rc.subr -name="utility" -rcvar=`set_rcvar` +name=utility +rcvar=utility_enable + command="/usr/local/sbin/utility" load_rc_config $name @@ -424,9 +424,7 @@ load_rc_config $name # SET THEM IN THE /etc/rc.conf FILE # utility_enable=${utility_enable-"NO"} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -pidfile="${utility_pidfile}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/el_GR.ISO8859-7/books/handbook/config/chapter.sgml b/el_GR.ISO8859-7/books/handbook/config/chapter.sgml index 870409eca4..f9e8e6a530 100644 --- a/el_GR.ISO8859-7/books/handbook/config/chapter.sgml +++ b/el_GR.ISO8859-7/books/handbook/config/chapter.sgml @@ -446,25 +446,21 @@ exit 0</programlisting> # REQUIRE: DAEMON # KEYWORD: shutdown +. /etc/rc.subr + +name=utility +rcvar=utility_enable + +command="/usr/local/sbin/utility" + +load_rc_config $name + # # DO NOT CHANGE THESE DEFAULT VALUES HERE # SET THEM IN THE /etc/rc.conf FILE # utility_enable=${utility_enable-"NO"} -utility_flags=${utility_flags-""} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -. /etc/rc.subr - -name="utility" -rcvar=`set_rcvar` -command="/usr/local/sbin/utility" - -load_rc_config $name - -pidfile="${utility_pidfile}" - -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/en_US.ISO8859-1/articles/rc-scripting/article.sgml b/en_US.ISO8859-1/articles/rc-scripting/article.sgml index 07a4cbc143..001f48309a 100644 --- a/en_US.ISO8859-1/articles/rc-scripting/article.sgml +++ b/en_US.ISO8859-1/articles/rc-scripting/article.sgml @@ -19,8 +19,8 @@ <copyright> <year>2005</year> - <year>2006</year> + <year>2012</year> <holder>The FreeBSD Project</holder> </copyright> @@ -389,8 +389,9 @@ run_rc_command "$1"<co id="rcng-dummy-runcommand"></programlisting> . /etc/rc.subr -name="dummy" -rcvar=`set_rcvar`<co id="rcng-confdummy-rcvar"> +name=dummy +rcvar=dummy_enable<co id="rcng-confdummy-rcvar"> + start_cmd="${name}_start" stop_cmd=":" @@ -411,17 +412,7 @@ run_rc_command "$1"</programlisting> <calloutlist> <callout arearefs="rcng-confdummy-rcvar"> <para>The variable <envar>rcvar</envar> specifies - the name of the ON/OFF knob variable. The reason to - obtain the variable name from &man.rc.subr.8; by calling - <function>set_rcvar</function> is that different operating - systems adopted different conventions for it. Namely, - &os; sticks to the - <envar>${name}_enable</envar> - scheme while NetBSD uses just - <envar>${name}</envar> variables in its &man.rc.conf.5;. - For example, our script will be controlled by - <envar>dummy_enable</envar> in &os; and by <envar>dummy</envar> - in NetBSD.</para> + the name of the ON/OFF knob variable.</para> </callout> <callout arearefs="rcng-confdummy-loadconfig"> @@ -537,8 +528,9 @@ run_rc_command "$1"</programlisting> . /etc/rc.subr -name="mumbled" -rcvar=`set_rcvar` +name=mumbled +rcvar=mumbled_enable + command="/usr/sbin/${name}"<co id="rcng-daemon-basic-cmd"> load_rc_config $name @@ -629,8 +621,8 @@ run_rc_command "$1"</programlisting> . /etc/rc.subr -name="mumbled" -rcvar=`set_rcvar` +name=mumbled +rcvar=mumbled_enable command="/usr/sbin/${name}" command_args="mock arguments > /dev/null 2>&1"<co id="rcng-daemon-adv-args"> @@ -1014,8 +1006,9 @@ fi</programlisting> . /etc/rc.subr -name="mumbled" -rcvar=`set_rcvar` +name=mumbled +rcvar=mumbled_enable + command="/usr/sbin/${name}" start_precmd="${name}_prestart" diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.sgml b/en_US.ISO8859-1/books/handbook/config/chapter.sgml index 86f6afcf1e..d50e8f90f2 100644 --- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/config/chapter.sgml @@ -384,8 +384,9 @@ ifconfig_fxp0="inet 10.1.1.1/8"</programlisting></listitem> . /etc/rc.subr -name="utility" -rcvar=`set_rcvar` +name=utility +rcvar=utility_enable + command="/usr/local/sbin/utility" load_rc_config $name @@ -395,9 +396,7 @@ load_rc_config $name # SET THEM IN THE /etc/rc.conf FILE # utility_enable=${utility_enable-"NO"} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -pidfile="${utility_pidfile}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml index 656de7ce82..8a4803d272 100644 --- a/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml +++ b/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml @@ -519,25 +519,21 @@ exit 0</programlisting> # REQUIRE: DAEMON # KEYWORD: shutdown +. /etc/rc.subr + +name=utility +rcvar=utility_enable + +command="/usr/local/sbin/utility" + +load_rc_config $name + # # DO NOT CHANGE THESE DEFAULT VALUES HERE # SET THEM IN THE /etc/rc.conf FILE # utility_enable=${utility_enable-"NO"} -utility_flags=${utility_flags-""} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -. /etc/rc.subr - -name="utility" -rcvar=`set_rcvar` -command="/usr/local/sbin/utility" - -load_rc_config $name - -pidfile="${utility_pidfile}" - -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml index 73666a7d76..f2cd22d5fa 100644 --- a/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml +++ b/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml @@ -553,8 +553,9 @@ . /etc/rc.subr -name="utility" -rcvar=`set_rcvar` +name=utility +rcvar=utility_enable + command="/usr/local/sbin/utility" load_rc_config $name @@ -564,9 +565,7 @@ load_rc_config $name # INKÁBB AZ /etc/rc.conf ÁLLOMÁNYBAN ÁLLÍTSUK BE EZEKET # utility_enable=${utility_enable-"NO"} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -pidfile="${utility_pidfile}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/it_IT.ISO8859-15/books/handbook/config/chapter.sgml b/it_IT.ISO8859-15/books/handbook/config/chapter.sgml index a5dc2464bd..64e69bc46f 100644 --- a/it_IT.ISO8859-15/books/handbook/config/chapter.sgml +++ b/it_IT.ISO8859-15/books/handbook/config/chapter.sgml @@ -455,25 +455,21 @@ exit 0</programlisting> # REQUIRE: DAEMON # KEYWORD: shutdown +. /etc/rc.subr + +name=utility +rcvar=utility_enable + +command="/usr/local/sbin/utility" + +load_rc_config $name + # # DO NOT CHANGE THESE DEFAULT VALUES HERE # SET THEM IN THE /etc/rc.conf FILE # utility_enable=${utility_enable-"NO"} -utility_flags=${utility_flags-""} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -. /etc/rc.subr - -name="utility" -rcvar=`set_rcvar` -command="/usr/local/sbin/utility" - -load_rc_config $name - -pidfile="${utility_pidfile}" - -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/ja_JP.eucJP/man/man8/rc.8 b/ja_JP.eucJP/man/man8/rc.8 index 0f071dcb60..bfeca2b363 100644 --- a/ja_JP.eucJP/man/man8/rc.8 +++ b/ja_JP.eucJP/man/man8/rc.8 @@ -471,8 +471,9 @@ PVC \&. /etc/rc.subr -name="foo" -rcvar=`set_rcvar` +name=foo +rcvar=foo_enable + command="/usr/local/bin/foo" load_rc_config $name @@ -492,8 +493,9 @@ run_rc_command "$1" \&. /etc/rc.subr -name="foo" -rcvar=`set_rcvar` +name=foo +rcvar=foo_enable + command="/usr/local/bin/foo" extra_commands="nop hello" hello_cmd="echo Hello World." diff --git a/ja_JP.eucJP/man/man8/rc.subr.8 b/ja_JP.eucJP/man/man8/rc.subr.8 index 017bc3d1a7..8bc1e5822a 100644 --- a/ja_JP.eucJP/man/man8/rc.subr.8 +++ b/ja_JP.eucJP/man/man8/rc.subr.8 @@ -77,8 +77,6 @@ .It .Ic run_rc_script Ar file Ar argument .It -.Ic set_rcvar Op Ar base -.It .Ic wait_for_pids Op Ar pid ... .It .Ic warn Ar message @@ -712,34 +710,6 @@ fast .Ar file ���ɤ߹��ߤޤ��� .El -.It Ic set_rcvar Op Ar base -�����ӥ���ư�����뤿���ɬ�פ��ѿ�̾�����ꤷ�ޤ��� -�̾� -.Fx -�Ǥϡ��ǡ�����̾�Τ�ʸ���� -.Dq Li "_enable" -����֤��� -.Xr rc.conf 5 -�ѿ��ˤ�ꡢ�ǡ�������椵��ޤ��� -����� -.Nx -�ˤ����ƤϤޤ�ޤ��� -���Τ褦�ʹԤ�������ץ���ˤ����硢 -.Pp -.Dl "rcvar=`set_rcvar`" -.Pp -���δؿ���Ŭ�ڤ� -.Xr rc.conf 5 -�Υ֤�������뤿��ˡ��ƤӽФ�¦�Υ�����ץȤ��������Ƥ���٤��ѿ� -.Va $name -���ͤ���Ѥ��ޤ��� -���� -.Ar base -�����ꤵ��Ƥ�����ϡ� -.Va $name -������� -.Ar base -����Ѥ��ޤ��� .It Ic wait_for_pids Op Ar pid ... ���ꤵ�줿���Ƥ� .Ar pid diff --git a/mn_MN.UTF-8/books/handbook/config/chapter.sgml b/mn_MN.UTF-8/books/handbook/config/chapter.sgml index f2f4820c06..8980d46529 100644 --- a/mn_MN.UTF-8/books/handbook/config/chapter.sgml +++ b/mn_MN.UTF-8/books/handbook/config/chapter.sgml @@ -367,8 +367,9 @@ ifconfig_fxp0="inet 10.1.1.1/8"</programlisting></listitem> . /etc/rc.subr -name="utility" -rcvar=`set_rcvar` +name=utility +rcvar=utility_enable + command="/usr/local/sbin/utility" load_rc_config $name @@ -378,9 +379,7 @@ load_rc_config $name # SET THEM IN THE /etc/rc.conf FILE # utility_enable=${utility_enable-"NO"} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -pidfile="${utility_pidfile}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml index 66db270fbf..35be4427c2 100644 --- a/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml +++ b/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml @@ -429,8 +429,9 @@ ifconfig_fxp0="inet 10.1.1.1/8"</programlisting></listitem> . /etc/rc.subr -name="utility" -rcvar=`set_rcvar` +name=utility +rcvar=utility_enable + command="/usr/local/sbin/utility" load_rc_config $name @@ -440,9 +441,7 @@ load_rc_config $name # STEL ZE IN IN HET BESTAND /etc/rc.conf # utility_enable=${utility_enable-"NO"} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -pidfile="${utility_pidfile}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/pl_PL.ISO8859-2/books/handbook/config/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/config/chapter.sgml index 959bd62835..d133a76df6 100644 --- a/pl_PL.ISO8859-2/books/handbook/config/chapter.sgml +++ b/pl_PL.ISO8859-2/books/handbook/config/chapter.sgml @@ -432,25 +432,21 @@ exit 0</programlisting> # REQUIRE: DAEMON # KEYWORD: shutdown +. /etc/rc.subr + +name=utility +rcvar=utility_enable + +command="/usr/local/sbin/utility" + +load_rc_config $name + # # DO NOT CHANGE THESE DEFAULT VALUES HERE # SET THEM IN THE /etc/rc.conf FILE # utility_enable=${utility_enable-"NO"} -utility_flags=${utility_flags-""} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -. /etc/rc.subr - -name="utility" -rcvar=`set_rcvar` -command="/usr/local/sbin/utility" - -load_rc_config $name - -pidfile="${utility_pidfile}" - -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/ru_RU.KOI8-R/books/handbook/config/chapter.sgml b/ru_RU.KOI8-R/books/handbook/config/chapter.sgml index 7fb18c4d80..2926542c86 100644 --- a/ru_RU.KOI8-R/books/handbook/config/chapter.sgml +++ b/ru_RU.KOI8-R/books/handbook/config/chapter.sgml @@ -439,27 +439,21 @@ exit 0</programlisting> # REQUIRE: DAEMON # KEYWORD: shutdown -# -# �� ������� ����� ��� ����������� �������� -# ��������� �� � ����� /etc/rc.conf - -# - -utility_enable=${utility_enable-"NO"} -utility_flags=${utility_flags-""} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - . /etc/rc.subr -name="utility" -rcvar=`set_rcvar` +name=utility +rcvar=utility_pidfile + command="/usr/local/sbin/utility" load_rc_config $name -pidfile="${utility_pidfile}" - -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}" +# +# �� ������� ����� ��� ����������� �������� +# ��������� �� � ����� /etc/rc.conf +# +utility_enable=${utility_enable-"NO"} +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/zh_CN.GB2312/articles/rc-scripting/article.sgml b/zh_CN.GB2312/articles/rc-scripting/article.sgml index 93fe8d30f1..76faaa680b 100644 --- a/zh_CN.GB2312/articles/rc-scripting/article.sgml +++ b/zh_CN.GB2312/articles/rc-scripting/article.sgml @@ -25,8 +25,8 @@ <copyright> <year>2005</year> - <year>2006</year> + <year>2012</year> <holder>The FreeBSD Project</holder> </copyright> @@ -347,8 +347,9 @@ run_rc_command "$1"<co id="rcng-dummy-runcommand"></programlisting> . /etc/rc.subr -name="dummy" -rcvar=`set_rcvar`<co id="rcng-confdummy-rcvar"> +name=dummy +rcvar=dummy_enable<co id="rcng-confdummy-rcvar"> + start_cmd="${name}_start" stop_cmd=":" @@ -369,14 +370,7 @@ run_rc_command "$1"</programlisting> <calloutlist> <callout arearefs="rcng-confdummy-rcvar"> <para>���� <envar>rcvar</envar> ָ���� ON/OFF - ���ر��������֡��������� &man.rc.subr.8; - �б�������Ϊ�˵��ò�ͬ����ϵͳ�����õIJ�ͬ�涨�� - <function>set_rcvar</function>��Ҳ����˵��&os; ���ʹ�� - <envar>${name}_enable</envar> ��ʽ�� NetBSD �� - &man.rc.conf.5; ��ʹ�õ�ֻ�� <envar>${name}</envar> - ��������ʽ�����磬������ &os; ��ʹ�� - <envar>dummy_enable</envar> ���������ǵĽű����� - NetBSD ��ʹ�� <envar>dummy</envar> �����ơ�</para> + ���ر��������֡���������</para> </callout> <callout arearefs="rcng-confdummy-loadconfig"> @@ -479,8 +473,9 @@ run_rc_command "$1"</programlisting> . /etc/rc.subr -name="mumbled" -rcvar=`set_rcvar` +name=mumbled +rcvar=mumbled_enable + command="/usr/sbin/${name}"<co id="rcng-daemon-basic-cmd"> load_rc_config $name @@ -563,8 +558,8 @@ run_rc_command "$1"</programlisting> . /etc/rc.subr -name="mumbled" -rcvar=`set_rcvar` +name=mumbled +rcvar=mumbled_enable command="/usr/sbin/${name}" command_args="mock arguments > /dev/null 2>&1"<co id="rcng-daemon-adv-args"> @@ -903,8 +898,9 @@ fi</programlisting> . /etc/rc.subr -name="mumbled" -rcvar=`set_rcvar` +name=mumbled +rcvar=mumbled_enable + command="/usr/sbin/${name}" start_precmd="${name}_prestart" diff --git a/zh_CN.GB2312/books/handbook/config/chapter.sgml b/zh_CN.GB2312/books/handbook/config/chapter.sgml index 7d82ed5930..56df2de6d7 100644 --- a/zh_CN.GB2312/books/handbook/config/chapter.sgml +++ b/zh_CN.GB2312/books/handbook/config/chapter.sgml @@ -336,8 +336,9 @@ ifconfig_fxp0="inet 10.1.1.1/8"</programlisting></listitem> . /etc/rc.subr -name="utility" -rcvar=`set_rcvar` +name=utility +rcvar=utility_enable + command="/usr/local/sbin/utility" load_rc_config $name @@ -347,9 +348,7 @@ load_rc_config $name # SET THEM IN THE /etc/rc.conf FILE # utility_enable=${utility_enable-"NO"} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -pidfile="${utility_pidfile}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting> diff --git a/zh_TW.Big5/books/handbook/config/chapter.sgml b/zh_TW.Big5/books/handbook/config/chapter.sgml index 4d488ad549..bb7e412e8f 100644 --- a/zh_TW.Big5/books/handbook/config/chapter.sgml +++ b/zh_TW.Big5/books/handbook/config/chapter.sgml @@ -394,25 +394,21 @@ exit 0</programlisting> # REQUIRE: DAEMON # KEYWORD: shutdown +. /etc/rc.subr + +name=utility +rcvar=utility_pidfile + +command="/usr/local/sbin/utility" + +load_rc_config $name + # # DO NOT CHANGE THESE DEFAULT VALUES HERE # SET THEM IN THE /etc/rc.conf FILE # utility_enable=${utility_enable-"NO"} -utility_flags=${utility_flags-""} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - -. /etc/rc.subr - -name="utility" -rcvar=`set_rcvar` -command="/usr/local/sbin/utility" - -load_rc_config $name - -pidfile="${utility_pidfile}" - -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}" +pidfile=${utility_pidfile-"/var/run/utility.pid"} run_rc_command "$1"</programlisting>