OS-7141 Overlay device-creation weirdness contributes to varpd boot failures

Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jason King <jbk@joyent.com>
Approved by: Jason King <jbk@joyent.com>

4 files changed, 14 insertions, 40 deletions

diff --git a/usr/src/cmd/varpd/Makefile b/usr/src/cmd/varpd/Makefile
index 8c29829d40..ea37ac6f71 100644
--- a/usr/src/cmd/varpd/Makefile
+++ b/usr/src/cmd/varpd/Makefile
@@ -16,7 +16,6 @@
 PROG= varpd
 OBJS = varpd.o
 SRCS = $(OBJS:%.o=../%.c)
-SVCMETHOD = svc-varpd
 MANIFEST = varpd.xml
 ROOTLIBVARPD = $(ROOTLIB)/varpd
 ROOTLIBVARPDPROG=	$(PROG:%=$(ROOTLIBVARPD)/%)
@@ -63,7 +62,7 @@ check: $(CHKMANIFEST)
 clobber: clean
 	$(RM) $(PROG)
 
-install: $(PROG) $(ROOTLIBVARPDPROG) $(ROOTMANIFEST) $(ROOTSVCMETHOD)
+install: $(PROG) $(ROOTLIBVARPDPROG) $(ROOTMANIFEST)
 
 $(ROOTLIBVARPD):
 	$(INS.dir)
diff --git a/usr/src/cmd/varpd/svc-varpd b/usr/src/cmd/varpd/svc-varpd
deleted file mode 100644
index c7483a033e..0000000000
--- a/usr/src/cmd/varpd/svc-varpd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/sh
-#
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2015 Joyent, Inc.
-#
-
-. /lib/svc/share/smf_include.sh
-
-#
-# For the time being, we're going to manually make sure that the
-# overlay driver is loaded. We probably shouldn't do that in the long
-# run, but it helps for bootstrapping
-#
-add_drv overlay 2>/dev/null
-
-/usr/lib/varpd/varpd
-if [ $? = 0 ]; then
-	exit $SMF_EXIT_OK
-else
-	exit $SMF_EXIT_ERR_FATAL
-fi
diff --git a/usr/src/cmd/varpd/varpd.c b/usr/src/cmd/varpd/varpd.c
index 8131604537..896f39733a 100644
--- a/usr/src/cmd/varpd/varpd.c
+++ b/usr/src/cmd/varpd/varpd.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (c) 2015 Joyent, Inc.
+ * Copyright (c) 2018 Joyent, Inc.
  */
 
 /*
@@ -60,9 +60,9 @@
 #include <priv.h>
 #include <libscf.h>
 
-#define	VARPD_EXIT_REQUESTED	0
-#define	VARPD_EXIT_FATAL	1
-#define	VARPD_EXIT_USAGE	2
+#define	VARPD_EXIT_REQUESTED	SMF_EXIT_OK
+#define	VARPD_EXIT_FATAL	SMF_EXIT_ERR_FATAL
+#define	VARPD_EXIT_USAGE	SMF_EXIT_ERR_CONFIG
 
 #define	VARPD_RUNDIR	"/var/run/varpd"
 #define	VARPD_DEFAULT_DOOR	"/var/run/varpd/varpd.door"
diff --git a/usr/src/cmd/varpd/varpd.xml b/usr/src/cmd/varpd/varpd.xml
index 0a9201e90d..df7015a3d6 100644
--- a/usr/src/cmd/varpd/varpd.xml
+++ b/usr/src/cmd/varpd/varpd.xml
@@ -10,7 +10,7 @@ A full copy of the text of the CDDL should have accompanied this
 source.  A copy of the CDDL is also available via the Internet at
 http://www.illumos.org/license/CDDL.
 
-Copyright 2015, Joyent, Inc.
+Copyright 2018, Joyent, Inc.
 -->
 
 <service_bundle type="manifest" name="illumos:varpd" >
@@ -28,10 +28,17 @@ Copyright 2015, Joyent, Inc.
 			<service_fmri value="svc:/network/physical:default" />
 		</dependency>
 
+		<dependency name="varpd-device-local"
+			grouping="require_all"
+			restart_on="none"
+			type="service">
+			<service_fmri value="svc:/system/device/local:default" />
+		</dependency>
+
 		<exec_method
 			type="method"
 			name="start"
-			exec="/lib/svc/method/svc-varpd"
+			exec="/usr/lib/varpd/varpd"
 			timeout_seconds="60" />
 
 		<exec_method