From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 8 Sep 2009 18:31:09 +0000 (-0400)
Subject: make fileserver avoid salvage loop on init failure
X-Git-Tag: openafs-devel-1_5_63~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5b6e5019453952f122523354d0001b04189271a7;p=packages%2Fo%2Fopenafs.git

make fileserver avoid salvage loop on init failure

if the vlserver or prserver setup can't succeed, it doesn't indicate
a condition which salvaging is required to fix; instead, come up
and retry in the background.

Reviewed-on: http://gerrit.openafs.org/428
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/viced/viced.c b/src/viced/viced.c
index b7f167109..78f895d1a 100644
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -2122,13 +2122,13 @@ main(int argc, char *argv[])
     ClearXStatValues();
 
     code = InitVL();
-    if (code) {
+    if (code && code != VL_MULTIPADDR) {
 	ViceLog(0, ("Fatal error in library initialization, exiting!!\n"));
 	exit(1);
     }
 
     code = InitPR();
-    if (code) {
+    if (code && code != -1) {
 	ViceLog(0, ("Fatal error in protection initialization, exiting!!\n"));
 	exit(1);
     }