diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-12-01 09:04:38 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-12-01 09:04:38 -0800 |
| commit | e50fa53fa0112e15d7ee3ab8ed333f16484bd356 (patch) | |
| tree | 10c677dde7ab00bcb8b7a0979c289ba3ac013a8a /etc/init.d | |
| parent | aad4a917f5109984888b4ee590d9432d6b4d64e5 (diff) | |
| download | vyatta-cfg-e50fa53fa0112e15d7ee3ab8ed333f16484bd356.tar.gz vyatta-cfg-e50fa53fa0112e15d7ee3ab8ed333f16484bd356.zip | |
Simplify failure message handling
1. If sub-init failed then generate failure (not warning) if exit
code is -1.
2. Don't need if test to check for disabled load.
Diffstat (limited to 'etc/init.d')
| -rwxr-xr-x | etc/init.d/vyatta-router | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/etc/init.d/vyatta-router b/etc/init.d/vyatta-router index d77aa96..e7a5783 100755 --- a/etc/init.d/vyatta-router +++ b/etc/init.d/vyatta-router @@ -123,7 +123,6 @@ load_bootfile () fi sg ${GROUP} -c "$vyatta_sbindir/vyatta-config-loader.pl $BOOTFILE" ) - log_end_msg $? } @@ -201,17 +200,14 @@ start () if ! disabled $s; then log_progress_msg $s if ! ${vyatta_sbindir}/${s}.init start - then log_end_msg $? + then log_failure_msg exit 1 fi fi done - if ! disabled configure; then - load_bootfile - else - log_success_msg - fi + disabled configure || load_bootfile + log_end_msg $? cleanup_raid telinit q |