#90: SMF should use contract

Author: nshalman

cmd/tailscaled/smf/install

@@ -8,12 +8,12 @@ fail () {
 	exit 1
 }
 
-PREFIX=/usr
+PREFIX=usr
 
 # On a SmartOS GZ, use /opt
 if [[ $(zonename) == "global" ]] && uname -v | grep -q joyent
 then
-	PREFIX=/opt
+	PREFIX=opt
 fi
 
 svcadm disable -t vpn/tailscale || true
@@ -27,7 +27,7 @@ svccfg -s tailscale listprop startd/duration | grep -q contract || \
 sleep 1
 pkill tailscaled || true
 svcadm disable -st vpn/tailscale || true
-svccfg delete vpn/tailscale
+svccfg delete -f vpn/tailscale || true
 
 TMPDIR="$(mktemp -d)"
 pushd "${TMPDIR?}"
@@ -45,13 +45,15 @@ sha256sum --ignore-missing -c sha256sums
 rm sha256sums
 
 chmod +x "tailscaled-${OS?}"
-chmod +x "vpn-tailscale"
+mkdir -p "/${PREFIX?}/local/lib/svc/method/"
+chmod +x vpn-tailscale
+mv vpn-tailscale "/${PREFIX?}/local/lib/svc/method/"
 mv "tailscaled-${OS?}" "/${PREFIX?}/local/sbin/tailscaled"
 rm -f "/${PREFIX?}/local/sbin/tailscale"
 ln -s tailscaled "/${PREFIX?}/local/sbin/tailscale"
-<tailscale.xml | sed "s/@@PREFIX@@/${PREFIX?}/" > import.xml
+<tailscale.xml sed "s/@@PREFIX@@/${PREFIX?}/" > import.xml
 svccfg import import.xml
-svccfg setprop vpn/tailscale application/binary="/${PREFIX?}/local/sbin/tailscaled"
+svccfg -s vpn/tailscale setprop application/binary="/${PREFIX?}/local/sbin/tailscaled"
 svcadm enable -st vpn/tailscale
 rm tailscale.xml import.xml