diff options
| author | mtm <mtm@FreeBSD.org> | 2004-02-26 12:19:48 +0000 |
|---|---|---|
| committer | mtm <mtm@FreeBSD.org> | 2004-02-26 12:19:48 +0000 |
| commit | c274def8fc75bc97749d1c559a5cfefe96ce2a4c (patch) | |
| tree | d0b8c641e493f599d084184c0aa268a145165aa1 /etc/rc.subr | |
| parent | 4287fb43407db1cad8142160c12c997255a03600 (diff) | |
| download | FreeBSD-src-c274def8fc75bc97749d1c559a5cfefe96ce2a4c.zip FreeBSD-src-c274def8fc75bc97749d1c559a5cfefe96ce2a4c.tar.gz | |
NetBSD rev. 1.53, 1.54 and 1.55:
Change how internal boolean variables are used to:
if ! ${_somevar:-false}; then
_somevar=true
fi
(Consisent, slightly quicker, and slightly cleaner)
Obtained from: NetBSD
Diffstat (limited to 'etc/rc.subr')
| -rw-r--r-- | etc/rc.subr | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/etc/rc.subr b/etc/rc.subr index aa78538..9aa1ccd 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -163,13 +163,15 @@ mount_critical_filesystems() eval _fslist=\$critical_filesystems_${1} for _fs in $_fslist; do mount | ( - _ismounted=no + _ismounted=false while read what _on on _type type; do if [ $on = $_fs ]; then - _ismounted=yes + _ismounted=true fi done - if [ $_ismounted = no ]; then + if $_ismounted; then + : + else mount $_fs >/dev/null 2>&1 fi ) @@ -742,10 +744,10 @@ $command $rc_flags $command_args" # prevent restart being called more # than once by any given script # - if [ -n "$_rc_restart_done" ]; then + if ${_rc_restart_done:-false}; then return 0 fi - _rc_restart_done=YES + _rc_restart_done=true ( $0 ${rc_force:+force}stop ) $0 ${rc_force:+force}start @@ -840,7 +842,9 @@ load_rc_config() err 3 'USAGE: load_rc_config command' fi - if [ -z "$_rc_conf_loaded" ]; then + if ${_rc_conf_loaded:-false}; then + : + else if [ -r /etc/defaults/rc.conf ]; then debug "Sourcing /etc/defaults/rc.conf" . /etc/defaults/rc.conf @@ -849,7 +853,7 @@ load_rc_config() debug "Sourcing /etc/rc.conf (/etc/defaults/rc.conf doesn't exist)." . /etc/rc.conf fi - _rc_conf_loaded=YES + _rc_conf_loaded=true fi if [ -f /etc/rc.conf.d/"$_command" ]; then debug "Sourcing /etc/rc.conf.d/${_command}" |
