From 02e213b1cdb1ff05d96d2c80bd336d7816c15d29 Mon Sep 17 00:00:00 2001
From: asvow <asvow@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:12:33 +0800
Subject: [PATCH] Update

---
 htdocs/luci-static/resources/view/tailscale/base.js      | 8 ++++----
 htdocs/luci-static/resources/view/tailscale/interface.js | 1 +
 root/etc/config/tailscale                                | 2 ++
 root/etc/init.d/tailscale                                | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 root/etc/config/tailscale

diff --git a/htdocs/luci-static/resources/view/tailscale/base.js b/htdocs/luci-static/resources/view/tailscale/base.js
index 918fb6f..efbdbe0 100644
--- a/htdocs/luci-static/resources/view/tailscale/base.js
+++ b/htdocs/luci-static/resources/view/tailscale/base.js
@@ -58,13 +58,13 @@ function renderStatus(isRunning) {
 function renderLogin(loginStatus, authURL) {
 	var spanTemp = '<span style="color:%s">%s</span>';
 	var renderHTML;
-	if (loginStatus.backendState == undefined) {
+	if (loginStatus == undefined) {
 		renderHTML = String.format(spanTemp, 'orange', _('NOT RUNNING'));
 	} else {
-		if (loginStatus.backendState == "NeedsLogin") {
+		if (loginStatus == "NeedsLogin") {
 			renderHTML = String.format('<a href="%s" target="_blank">%s</a>', authURL, _('Needs Login'));
 		} else {
-			renderHTML = String.format(spanTemp, 'green', _('Logged IN'));
+			renderHTML = String.format(spanTemp, 'green', _('Logged In'));
 		}
 	}
 
@@ -105,7 +105,7 @@ return view.extend({
 		o.renderWidget = function(section_id, option_id) {
 			poll.add(function() {
 				return L.resolveDefault(getLoginStatus()).then(function(res) {
-					document.getElementById('login_status_div').innerHTML = renderLogin(res, res.authURL);
+					document.getElementById('login_status_div').innerHTML = renderLogin(res.backendState, res.authURL);
 				});
 			});
 	
diff --git a/htdocs/luci-static/resources/view/tailscale/interface.js b/htdocs/luci-static/resources/view/tailscale/interface.js
index dcd0647..3d79c1a 100644
--- a/htdocs/luci-static/resources/view/tailscale/interface.js
+++ b/htdocs/luci-static/resources/view/tailscale/interface.js
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-3.0-only
  *
+ * Copyright (C) 2022 ImmortalWrt.org
  * Copyright (C) 2024 asvow
  */
 
diff --git a/root/etc/config/tailscale b/root/etc/config/tailscale
new file mode 100644
index 0000000..e7a56a3
--- /dev/null
+++ b/root/etc/config/tailscale
@@ -0,0 +1,2 @@
+config tailscale 'settings'
+	option enabled '0'
\ No newline at end of file
diff --git a/root/etc/init.d/tailscale b/root/etc/init.d/tailscale
index 9f21acf..d14af29 100755
--- a/root/etc/init.d/tailscale
+++ b/root/etc/init.d/tailscale
@@ -66,7 +66,7 @@ start_instance() {
 
 start_service() {
 	config_load 'tailscale'
-	config_foreach start_instance 'settings'
+	config_foreach start_instance 'tailscale'
 }
 
 stop_instance() {
@@ -80,7 +80,7 @@ stop_instance() {
 
 stop_service() {
 	config_load 'tailscale'
-	config_foreach stop_instance 'settings'
+	config_foreach stop_instance 'tailscale'
 }
 
 reload_service() {