diff options
author | dteske <dteske@FreeBSD.org> | 2014-04-14 01:44:56 +0000 |
---|---|---|
committer | dteske <dteske@FreeBSD.org> | 2014-04-14 01:44:56 +0000 |
commit | 4f557eb9380e350e00df186d627969b28ea499a8 (patch) | |
tree | 00bb6a6eea5764702d03d61c8ace4e43d4b012aa /etc/rc.d | |
parent | 7c94aa998b99433249dd333543dac870e358fee1 (diff) | |
download | FreeBSD-src-4f557eb9380e350e00df186d627969b28ea499a8.zip FreeBSD-src-4f557eb9380e350e00df186d627969b28ea499a8.tar.gz |
MFC r264243:
Loosen the processing of *_IF_aliasN vars to be less strict. Previously,
the first alias had to be _alias0 and processing stopped at the first non-
defined variable (preventing gaps). Allowing gaps gives the administrator
the ability to group aliases in an adhoc manner and also lifts the
requirement to renumber aliases simply to comment-out an existing one.
Aliases are processed in numerical ascending order.
NB: Also Patches mdconfig{,2} rc(8) boot scripts to loosen the numbering
scheme for mdconfig_mdN settings to be less strict in the same manner.
Discussed on: -rc
Diffstat (limited to 'etc/rc.d')
-rwxr-xr-x | etc/rc.d/mdconfig | 15 | ||||
-rwxr-xr-x | etc/rc.d/mdconfig2 | 15 |
2 files changed, 12 insertions, 18 deletions
diff --git a/etc/rc.d/mdconfig b/etc/rc.d/mdconfig index 7b9ddf8..627da87 100755 --- a/etc/rc.d/mdconfig +++ b/etc/rc.d/mdconfig @@ -181,17 +181,14 @@ fi load_rc_config $name -_mdconfig_unit=0 if [ -z "${_mdconfig_list}" ]; then - while :; do - eval _mdconfig_config=\$mdconfig_md${_mdconfig_unit} - if [ -z "${_mdconfig_config}" ]; then - break - else - _mdconfig_list="${_mdconfig_list}${_mdconfig_list:+ }md${_mdconfig_unit}" - _mdconfig_unit=$((${_mdconfig_unit} + 1)) - fi + for _mdconfig_config in `list_vars mdconfig_md[0-9]\* | + sort_lite -nk1.12` + do + _mdconfig_unit=${_mdconfig_config#mdconfig_md} + _mdconfig_list="$_mdconfig_list md$_mdconfig_unit" done + _mdconfig_list="${_mdconfig_list# }" fi run_rc_command "${_mdconfig_cmd}" diff --git a/etc/rc.d/mdconfig2 b/etc/rc.d/mdconfig2 index 4b1535e..85fd07f 100755 --- a/etc/rc.d/mdconfig2 +++ b/etc/rc.d/mdconfig2 @@ -211,17 +211,14 @@ fi load_rc_config $name -_mdconfig2_unit=0 if [ -z "${_mdconfig2_list}" ]; then - while :; do - eval _mdconfig2_config=\$mdconfig_md${_mdconfig2_unit} - if [ -z "${_mdconfig2_config}" ]; then - break - else - _mdconfig2_list="${_mdconfig2_list}${_mdconfig2_list:+ }md${_mdconfig2_unit}" - _mdconfig2_unit=$((${_mdconfig2_unit} + 1)) - fi + for _mdconfig2_config in `list_vars mdconfig_md[0-9]\* | + sort_lite -nk1.12` + do + _mdconfig2_unit=${_mdconfig2_config#mdconfig_md} + _mdconfig2_list="$_mdconfig2_list md$_mdconfig2_unit" done + _mdconfig2_list="${_mdconfig2_list# }" fi run_rc_command "${_mdconfig2_cmd}" |