Skip to content

Commit a2fb07d

Browse files
committed
sunos: improve installer, tun driver configurable
1 parent 6b465cc commit a2fb07d

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

cmd/tailscaled/smf/install

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ ln -s tailscaled "/${PREFIX?}/local/sbin/tailscale"
5454
<tailscale.xml sed "s/@@PREFIX@@/${PREFIX?}/" > import.xml
5555
svccfg import import.xml
5656
svccfg -s vpn/tailscale setprop application/binary="/${PREFIX?}/local/sbin/tailscaled"
57+
svccfg -s vpn/tailscale setprop application/tun_driver="tun"
5758
svcadm enable -st vpn/tailscale
5859
rm tailscale.xml import.xml
5960

@@ -62,3 +63,7 @@ rm -rf "${TMPDIR}"
6263

6364
sleep 2
6465
tailscale status
66+
67+
echo "To switch to non-tun userspace networking you can run:"
68+
echo 'svccfg -s vpn/tailscale setprop application/tun_driver="userspace-networking"'
69+
echo "and then restart tailscale"

cmd/tailscaled/smf/tailscale.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<exec_method name='stop' type='method' exec='/@@PREFIX@@/local/lib/svc/method/vpn-tailscale %m %{restarter/contract}' timeout_seconds='5'/>
1818
<property_group name='application' type='application'>
1919
<propval name='binary' type='astring' value='/@@PREFIX@@/local/sbin/tailscaled'/>
20+
<propval name='tun_driver' type='astring' value='tun'/>
2021
</property_group>
2122
<stability value='Evolving'/>
2223
<template>

cmd/tailscaled/smf/vpn-tailscale

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33

44
. /lib/svc/share/smf_include.sh
55

6-
TAILSCALED=$(svcprop -p application/binary $SMF_FMRI)
6+
TAILSCALED=$(svcprop -c -p application/binary "$SMF_FMRI")
7+
TUN_DRIVER=$(svcprop -c -p application/tun_driver "$SMF_FMRI")
78
case "$1" in
89
start)
910
smf_clear_env
10-
"${TAILSCALED?}" &
11+
"${TAILSCALED?}" -tun "${TUN_DRIVER?}" &
1112
;;
1213
stop)
13-
smf_kill_contract $2 TERM 60
14+
smf_kill_contract "$2" TERM 60
1415
"${TAILSCALED?}" --cleanup
1516
;;
1617
*)
@@ -19,4 +20,4 @@ stop)
1920
;;
2021
esac
2122

22-
exit $SMF_EXIT_OK
23+
exit "$SMF_EXIT_OK"

0 commit comments

Comments
 (0)