X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Flockd%2Flockd.c;fp=utils%2Flockd%2Flockd.c;h=900510b606e2321019503c0b12d810e346111e25;hp=05bc99938986879cfdd76b8cfeeb212ca02c1c16;hb=b419fe243f312c5b833530a4c0baac4b8530aed7;hpb=b5cb3f2f03186c514af01b835296da084ae286d9

diff --git a/utils/lockd/lockd.c b/utils/lockd/lockd.c
index 05bc999..900510b 100644
--- a/utils/lockd/lockd.c
+++ b/utils/lockd/lockd.c
@@ -9,6 +9,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <errno.h>
 #include "nfslib.h"
 
 static void	usage(const char *);
@@ -21,8 +22,14 @@ main(int argc, char **argv)
 	if (argc > 1)
 		usage (argv [0]);
 
-	if ((error = lockdsvc()) < 0)
-		perror("lockdsvc");
+	if ((error = lockdsvc()) < 0) {
+		if (errno == EINVAL)
+			/* Ignore EINVAL since kernel may start
+			   lockd automatically. */
+			error = 0;
+		else
+			perror("lockdsvc");
+	}
 
 	return (error != 0);
 }