From b8ae6fc95f8de7ce25e67327cb0ce494b42291be Mon Sep 17 00:00:00 2001
From: Cameron Thompson <50184035+iamromulan@users.noreply.github.com>
Date: Wed, 8 May 2024 11:39:07 -0400
Subject: [PATCH 1/9] Add favicon.ico to installation script

---
 simpleupdates/scripts/update_simpleadmin.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/simpleupdates/scripts/update_simpleadmin.sh b/simpleupdates/scripts/update_simpleadmin.sh
index 62e4099..10a6bb7 100644
--- a/simpleupdates/scripts/update_simpleadmin.sh
+++ b/simpleupdates/scripts/update_simpleadmin.sh
@@ -133,8 +133,9 @@ echo -e "\e[1;31m2) Installing simpleadmin from the $GITTREE branch\e[0m"
 			sleep 1
 			cd $SIMPLE_ADMIN_DIR/www
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/deviceinfo.html
+   			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/favicon.ico
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/index.html
-    		wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/network.html
+    		        wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/network.html
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/settings.html
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/sms.html
    			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/logout.html

From 0b26f94d8294c55ee3d7f54ff4e1bb7bd7cd7f34 Mon Sep 17 00:00:00 2001
From: Cameron Thompson <50184035+iamromulan@users.noreply.github.com>
Date: Wed, 8 May 2024 20:53:46 -0400
Subject: [PATCH 2/9] Add Console nav link

linked to /console to access ttyd shell
---
 simpleadmin/www/deviceinfo.html | 3 +++
 simpleadmin/www/index.html      | 3 +++
 simpleadmin/www/logout.html     | 4 ++--
 simpleadmin/www/network.html    | 3 +++
 simpleadmin/www/settings.html   | 3 +++
 simpleadmin/www/sms.html        | 3 +++
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/simpleadmin/www/deviceinfo.html b/simpleadmin/www/deviceinfo.html
index c3fa93f..078d1a3 100644
--- a/simpleadmin/www/deviceinfo.html
+++ b/simpleadmin/www/deviceinfo.html
@@ -50,6 +50,9 @@
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="/sms.html">SMS</a>
+                </li>
+				<li class="nav-item">
+                  <a class="nav-link" href="/console">Console</a>
                 </li>
                 <li class="nav-item">
                   <a
diff --git a/simpleadmin/www/index.html b/simpleadmin/www/index.html
index f360642..12cba84 100644
--- a/simpleadmin/www/index.html
+++ b/simpleadmin/www/index.html
@@ -55,6 +55,9 @@
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="/sms.html">SMS</a>
+                </li>
+				<li class="nav-item">
+                  <a class="nav-link" href="/console">Console</a>
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="/deviceinfo.html"
diff --git a/simpleadmin/www/logout.html b/simpleadmin/www/logout.html
index e658d2f..6566a50 100644
--- a/simpleadmin/www/logout.html
+++ b/simpleadmin/www/logout.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <!-- change to a much simpler tab title -->
-    <title>Simple Admin</title>
+    <title>Logging out...</title>
 
     <link rel="stylesheet" href="css/bulma.css" />
     <link rel="stylesheet" type="text/css" href="css/admin.css" />
@@ -17,7 +17,7 @@
     <nav class="navbar is-black" x-data="{ isOpen: false }">
       <div class="container">
         <div class="navbar-brand">
-          <a class="navbar-item brand-text" href="/"> Simple Admin </a>
+          <a class="navbar-item brand-text" href="/"> Logging Out... </a>
           <a
             role="button"
             class="navbar-burger burger"
diff --git a/simpleadmin/www/network.html b/simpleadmin/www/network.html
index dff6e87..9e57cdc 100644
--- a/simpleadmin/www/network.html
+++ b/simpleadmin/www/network.html
@@ -58,6 +58,9 @@
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="/sms.html">SMS</a>
+                </li>
+				<li class="nav-item">
+                  <a class="nav-link" href="/console">Console</a>
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="deviceinfo.html"
diff --git a/simpleadmin/www/settings.html b/simpleadmin/www/settings.html
index da1fbdd..b82ecea 100644
--- a/simpleadmin/www/settings.html
+++ b/simpleadmin/www/settings.html
@@ -51,6 +51,9 @@
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="/sms.html">SMS</a>
+                </li>
+				<li class="nav-item">
+                  <a class="nav-link" href="/console">Console</a>
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="/deviceinfo.html"
diff --git a/simpleadmin/www/sms.html b/simpleadmin/www/sms.html
index 3995d2c..a2ea30b 100644
--- a/simpleadmin/www/sms.html
+++ b/simpleadmin/www/sms.html
@@ -59,6 +59,9 @@
                     aria-current="page"
                     >SMS</a
                   >
+                </li>
+				<li class="nav-item">
+                  <a class="nav-link" href="/console">Console</a>
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="/deviceinfo.html"

From b89145e9e4071f8c1a49956f3c4254ec328c5055 Mon Sep 17 00:00:00 2001
From: iamromulan <50184035+iamromulan@users.noreply.github.com>
Date: Fri, 10 May 2024 15:03:25 -0400
Subject: [PATCH 3/9] Fix double / issue

Can now configure tailscale again
---
 RMxxx_rgmii_toolkit.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RMxxx_rgmii_toolkit.sh b/RMxxx_rgmii_toolkit.sh
index 855420d..a200f03 100644
--- a/RMxxx_rgmii_toolkit.sh
+++ b/RMxxx_rgmii_toolkit.sh
@@ -13,7 +13,7 @@ SIMPLE_ADMIN_DIR="/usrdata/simpleadmin"
 SIMPLE_FIREWALL_DIR="/usrdata/simplefirewall"
 SIMPLE_FIREWALL_SCRIPT="$SIMPLE_FIREWALL_DIR/simplefirewall.sh"
 SIMPLE_FIREWALL_SYSTEMD_DIR="$SIMPLE_FIREWALL_DIR/systemd"
-TAILSCALE_DIR="/usrdata/tailscale/"
+TAILSCALE_DIR="/usrdata/tailscale"
 TAILSCALE_SYSD_DIR="/usrdata/tailscale/systemd"
 # AT Command Script Variables and Functions
 DEVICE_FILE="/dev/smd7"
@@ -526,7 +526,7 @@ configure_tailscale() {
      	remount_ro
 	;;
 	3) $TAILSCALE_DIR/tailscale up --accept-dns=false --reset;;
-        4) $TAILSCALE_DIR/tailscale up --ssh --accept-dns=false --reset;;
+    4) $TAILSCALE_DIR/tailscale up --ssh --accept-dns=false --reset;;
 	5) $TAILSCALE_DIR/tailscale up --accept-dns=false --reset;;
      	6) $TAILSCALE_DIR/tailscale down;;
         7) $TAILSCALE_DIR/tailscale logout;;

From cb0d9e776dda37623585898cd84c593bb83a0d12 Mon Sep 17 00:00:00 2001
From: iamromulan <50184035+iamromulan@users.noreply.github.com>
Date: Fri, 10 May 2024 15:34:54 -0400
Subject: [PATCH 4/9] Remove old temp service first

Removes any leftover temp update service if they exist
---
 simpleupdates/scripts/update_simpleadmin.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/simpleupdates/scripts/update_simpleadmin.sh b/simpleupdates/scripts/update_simpleadmin.sh
index 6d7fefd..349f464 100644
--- a/simpleupdates/scripts/update_simpleadmin.sh
+++ b/simpleupdates/scripts/update_simpleadmin.sh
@@ -20,7 +20,13 @@ remount_rw() {
 remount_ro() {
     mount -o remount,ro /
 }
+
+# Installation Prep
 remount_rw
+systemctl daemon-reload
+rm $SERVICE_FILE
+rm $SERVICE_NAME
+
 # Create the systemd service file
 cat <<EOF > "$SERVICE_FILE"
 [Unit]
@@ -75,7 +81,7 @@ uninstall_simpleadmin() {
 	rm -rf "$SIMPLE_ADMIN_DIR"
     rm -f /lib/systemd/system/ttyd.service
     rm -f /lib/systemd/system/multi-user.target.wants/ttyd.service
-    rm -rf /bin/ttyd
+    rm -f /bin/ttyd
     echo -e "\e[1;32mttyd has been uninstalled.\e[0m"
 
     echo "Uninstallation process completed."
@@ -139,7 +145,7 @@ echo -e "\e[1;31m2) Installing simpleadmin from the $GITTREE branch\e[0m"
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/deviceinfo.html
    			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/favicon.ico
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/index.html
-    		        wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/network.html
+    		wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/network.html
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/settings.html
 			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/sms.html
    			wget https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/www/logout.html

From eb05cfad0bc3142aa1bbc02aae03f68499fe723c Mon Sep 17 00:00:00 2001
From: iamromulan <50184035+iamromulan@users.noreply.github.com>
Date: Fri, 10 May 2024 15:38:23 -0400
Subject: [PATCH 5/9] make silent

---
 simpleupdates/scripts/update_simpleadmin.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/simpleupdates/scripts/update_simpleadmin.sh b/simpleupdates/scripts/update_simpleadmin.sh
index 349f464..af07f3d 100644
--- a/simpleupdates/scripts/update_simpleadmin.sh
+++ b/simpleupdates/scripts/update_simpleadmin.sh
@@ -24,8 +24,8 @@ remount_ro() {
 # Installation Prep
 remount_rw
 systemctl daemon-reload
-rm $SERVICE_FILE
-rm $SERVICE_NAME
+rm $SERVICE_FILE > /dev/null 2>&1
+rm $SERVICE_NAME > /dev/null 2>&1
 
 # Create the systemd service file
 cat <<EOF > "$SERVICE_FILE"

From 67cc67641b9da75a0c5d3d63fb52bd6bbf369f68 Mon Sep 17 00:00:00 2001
From: Cameron Thompson <50184035+iamromulan@users.noreply.github.com>
Date: Fri, 10 May 2024 18:02:37 -0400
Subject: [PATCH 6/9] Console menu progress....

---
 simpleadmin/console/.profile           |  4 +-
 simpleadmin/console/menu/start_menu.sh | 95 +++++++++-----------------
 2 files changed, 36 insertions(+), 63 deletions(-)

diff --git a/simpleadmin/console/.profile b/simpleadmin/console/.profile
index 9fea5da..5713bf4 100644
--- a/simpleadmin/console/.profile
+++ b/simpleadmin/console/.profile
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #Path
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin:opt/bin:/opt/sbin:/usrdata/root/bin
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin:/usrdata/root/bin
 
 #Post-login execution 
-start_menu.sh
\ No newline at end of file
+/usrdata/simpleadmin/console/menu/start_menu.sh
\ No newline at end of file
diff --git a/simpleadmin/console/menu/start_menu.sh b/simpleadmin/console/menu/start_menu.sh
index 0955ebd..589fe65 100644
--- a/simpleadmin/console/menu/start_menu.sh
+++ b/simpleadmin/console/menu/start_menu.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # Define executable files path
-EXE=/usrdata/root/bin
 MENU_SH=/usrdata/simpleadmin/console/menu
 
 # Display Messages in Colors
@@ -23,79 +22,53 @@ display_red() {
 
 # Menus
 
-toolkit() {
+toolkit_menu() {
     while true; do
-        display_green "Welcome to iamromulan's Simple Console Menu"
+        display_green "Run a Toolkit version"
         display_green "Select an option:"
         echo "------------------"
-        display_green "1. LAN Settings"
-        display_green "2. Change simpleadmin (admin) password"
-        display_green "3. Change root password (shell/ssh/console)"
-        display_green "4. Open File Browser/Editor (mc)"
-        display_green "5. View Used/Available space"
-        display_green "6. Open Task Manager/View CPU Load"
-        display_green "7. Run speedtest.net test"
-        display_green "8. Run fast.com test (30Mbps max)"
-        display_green "9. Get and run the Toolkit"
-        display_green "10. Get and run the Development/unstable Toolkit"
-        display_green "11. Exit (Enter Root Shell)"
+        display_green "1. Get and run the Toolkit"
+        display_red "2. Get and run the Development/unstable Toolkit"
+        display_red "3. Exit (Enter Root Shell)"
+        echo
+        read -p "Select an option (1-11): " option
+
+        case "$option" in
+            1) cd /tmp && wget -O RMxxx_rgmii_toolkit.sh https://raw.githubusercontent.com/iamromulan/quectel-rgmii-toolkit/main/RMxxx_rgmii_toolkit.sh && chmod +x RMxxx_rgmii_toolkit.sh && ./RMxxx_rgmii_toolkit.sh && cd / ;;
+            2) cd /tmp && wget -O RMxxx_rgmii_toolkit.sh https://raw.githubusercontent.com/iamromulan/quectel-rgmii-toolkit/development/RMxxx_rgmii_toolkit.sh && chmod +x RMxxx_rgmii_toolkit.sh && ./RMxxx_rgmii_toolkit.sh && cd / ;;
+            3) break ;;
+            *) echo "Invalid option. Please try again." ;;
+        esac
+    done
+}
+
+apps_menu() {
+    while true; do
+        display_green "Run a modem App"
+        display_green "Select an option:"
+        echo "------------------"
+        display_random_color "1. Open File Browser/Editor (mc)"
+        display_random_color "2. View Used/Available space"
+        display_random_color "3. Open Task Manager/View CPU Load"
+        display_random_color "4. Run speedtest.net test"
+        display_random_color "5. Run fast.com test (30Mbps max)"
+        display_red "6. Go Back"
         echo
         read -p "Select an option (1-11): " option
 
         case "$option" in
-            1) $MEU/LAN_settings ;;
-            2) $EXE/simplepasswd ;;
-            3) passwd ;;
             4) mc ;;
             5) dfc ;;
             6) htop ;;
-            7) $EXE/speedtest ;;
-            8) $EXE/fast ;;
-            9) cd /tmp && wget -O RMxxx_rgmii_toolkit.sh https://raw.githubusercontent.com/iamromulan/quectel-rgmii-toolkit/main/RMxxx_rgmii_toolkit.sh && chmod +x RMxxx_rgmii_toolkit.sh && ./RMxxx_rgmii_toolkit.sh && cd / ;;
-            10) cd /tmp && wget -O RMxxx_rgmii_toolkit.sh https://raw.githubusercontent.com/iamromulan/quectel-rgmii-toolkit/development/RMxxx_rgmii_toolkit.sh && chmod +x RMxxx_rgmii_toolkit.sh && ./RMxxx_rgmii_toolkit.sh && cd / ;;
+            7) speedtest ;;
+            8) fast ;;
             11) break ;;
             *) echo "Invalid option. Please try again." ;;
         esac
     done
 }
 
-apps() {
-    while true; do
-        display_green "Welcome to iamromulan's Simple Console Menu"
-        display_green "Select an option:"
-        echo "------------------"
-        display_green "1. LAN Settings"
-        display_green "2. Change simpleadmin (admin) password"
-        display_green "3. Change root password (shell/ssh/console)"
-        display_green "4. Open File Browser/Editor (mc)"
-        display_green "5. View Used/Available space"
-        display_green "6. Open Task Manager/View CPU Load"
-        display_green "7. Run speedtest.net test"
-        display_green "8. Run fast.com test (30Mbps max)"
-        display_green "9. Get and run the Toolkit"
-        display_green "10. Get and run the Development/unstable Toolkit"
-        display_green "11. Exit (Enter Root Shell)"
-        echo
-        read -p "Select an option (1-11): " option
-
-        case "$option" in
-            1) $menu_sh/LAN_settings ;;
-            2) $EXE/simplepasswd ;;
-            3) passwd ;;
-            4) mc ;;
-            5) dfc ;;
-            6) htop ;;
-            7) $EXE/speedtest ;;
-            8) $EXE/fast ;;
-            9) cd /tmp && wget -O RMxxx_rgmii_toolkit.sh https://raw.githubusercontent.com/iamromulan/quectel-rgmii-toolkit/main/RMxxx_rgmii_toolkit.sh && chmod +x RMxxx_rgmii_toolkit.sh && ./RMxxx_rgmii_toolkit.sh && cd / ;;
-            10) cd /tmp && wget -O RMxxx_rgmii_toolkit.sh https://raw.githubusercontent.com/iamromulan/quectel-rgmii-toolkit/development/RMxxx_rgmii_toolkit.sh && chmod +x RMxxx_rgmii_toolkit.sh && ./RMxxx_rgmii_toolkit.sh && cd / ;;
-            11) break ;;
-            *) echo "Invalid option. Please try again." ;;
-        esac
-    done
-}
-
-settings() {
+settings_menu() {
     while true; do
         display_green "Welcome to iamromulan's Simple Console Menu"
         display_green "Select an option:"
@@ -131,9 +104,9 @@ main_menu() {
         read -p "Select an option (1-11): " option
 
         case "$option" in
-            1) apps ;;
-            2) settings ;;
-            3) toolkit ;;
+            1) apps_menu ;;
+            2) settings_menu ;;
+            3) toolkit_menu ;;
             4) break ;;
             *) echo "Invalid option. Please try again." ;;
         esac

From dc58ec17929d6422185d790a55f9bd9df814a091 Mon Sep 17 00:00:00 2001
From: iamromulan <50184035+iamromulan@users.noreply.github.com>
Date: Fri, 10 May 2024 20:37:10 -0400
Subject: [PATCH 7/9] Remove double console link

---
 simpleadmin/www/deviceinfo.html | 4 ----
 simpleadmin/www/index.html      | 3 ---
 simpleadmin/www/network.html    | 3 ---
 simpleadmin/www/settings.html   | 3 ---
 simpleadmin/www/sms.html        | 3 ---
 5 files changed, 16 deletions(-)

diff --git a/simpleadmin/www/deviceinfo.html b/simpleadmin/www/deviceinfo.html
index 611ae90..487c49e 100644
--- a/simpleadmin/www/deviceinfo.html
+++ b/simpleadmin/www/deviceinfo.html
@@ -54,10 +54,6 @@
 				<li class="nav-item">
                   <a class="nav-link" href="/console">Console</a>
                 </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="/console">Console</a>
-                </li>
-                <li class="nav-item">
                   <a
                     class="nav-link active"
                     href="/deviceinfo.html"
diff --git a/simpleadmin/www/index.html b/simpleadmin/www/index.html
index f614b23..fca7dc0 100644
--- a/simpleadmin/www/index.html
+++ b/simpleadmin/www/index.html
@@ -59,9 +59,6 @@
 				<li class="nav-item">
                   <a class="nav-link" href="/console">Console</a>
                 </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="/console">Console</a>
-                </li>
                 <li class="nav-item">
                   <a class="nav-link" href="/deviceinfo.html"
                     >Device Information</a
diff --git a/simpleadmin/www/network.html b/simpleadmin/www/network.html
index a689d48..0383231 100644
--- a/simpleadmin/www/network.html
+++ b/simpleadmin/www/network.html
@@ -62,9 +62,6 @@
 				<li class="nav-item">
                   <a class="nav-link" href="/console">Console</a>
                 </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="/console">Console</a>
-                </li>
                 <li class="nav-item">
                   <a class="nav-link" href="deviceinfo.html"
                     >Device Information</a
diff --git a/simpleadmin/www/settings.html b/simpleadmin/www/settings.html
index 5b62cb0..09cf8df 100644
--- a/simpleadmin/www/settings.html
+++ b/simpleadmin/www/settings.html
@@ -55,9 +55,6 @@
 				<li class="nav-item">
                   <a class="nav-link" href="/console">Console</a>
                 </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="/console">Console</a>
-                </li>
                 <li class="nav-item">
                   <a class="nav-link" href="/deviceinfo.html"
                     >Device Information</a
diff --git a/simpleadmin/www/sms.html b/simpleadmin/www/sms.html
index 24a27e0..a2ea30b 100644
--- a/simpleadmin/www/sms.html
+++ b/simpleadmin/www/sms.html
@@ -63,9 +63,6 @@
 				<li class="nav-item">
                   <a class="nav-link" href="/console">Console</a>
                 </li>
-                <li class="nav-item">
-                  <a class="nav-link" href="/console">Console</a>
-                </li>
                 <li class="nav-item">
                   <a class="nav-link" href="/deviceinfo.html"
                     >Device Information</a

From 603096ce814bc0f72267aa86522bf895f667a89a Mon Sep 17 00:00:00 2001
From: iamromulan <50184035+iamromulan@users.noreply.github.com>
Date: Fri, 10 May 2024 20:50:00 -0400
Subject: [PATCH 8/9] Fix tailscale update

Binaries should download to /usrdata/root temporarily now.
---
 simpleupdates/scripts/update_tailscale.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/simpleupdates/scripts/update_tailscale.sh b/simpleupdates/scripts/update_tailscale.sh
index 5b97625..1790e7c 100644
--- a/simpleupdates/scripts/update_tailscale.sh
+++ b/simpleupdates/scripts/update_tailscale.sh
@@ -30,6 +30,7 @@ EOF
 cat <<EOF > "$TMP_SCRIPT"
 #!/bin/bash
 
+export HOME=/usrdata/root
 GITUSER="iamromulan"
 GITTREE="development"
 TAILSCALE_DIR="/usrdata/tailscale/"

From c4fd0d6c7dbaa85afb7eb77f0f9194a7d603e182 Mon Sep 17 00:00:00 2001
From: iamromulan <50184035+iamromulan@users.noreply.github.com>
Date: Fri, 10 May 2024 20:56:40 -0400
Subject: [PATCH 9/9] Fix read/write issues

---
 simpleupdates/scripts/update_tailscale.sh | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/simpleupdates/scripts/update_tailscale.sh b/simpleupdates/scripts/update_tailscale.sh
index 1790e7c..7179e31 100644
--- a/simpleupdates/scripts/update_tailscale.sh
+++ b/simpleupdates/scripts/update_tailscale.sh
@@ -12,6 +12,21 @@ LOG_FILE="/tmp/install_sshd.log"
 # Tmp Script dependent constants 
 TAILSCALE_DIR="/usrdata/tailscale/"
 TAILSCALE_SYSD_DIR="/usrdata/tailscale/systemd"
+# Function to remount file system as read-write
+remount_rw() {
+    mount -o remount,rw /
+}
+
+# Function to remount file system as read-only
+remount_ro() {
+    mount -o remount,ro /
+}
+
+# Installation Prep
+remount_rw
+systemctl daemon-reload
+rm $SERVICE_FILE > /dev/null 2>&1
+rm $SERVICE_NAME > /dev/null 2>&1
 
 # Create the systemd service file
 cat <<EOF > "$SERVICE_FILE"
@@ -36,6 +51,16 @@ GITTREE="development"
 TAILSCALE_DIR="/usrdata/tailscale/"
 TAILSCALE_SYSD_DIR="/usrdata/tailscale/systemd"
 
+# Function to remount file system as read-write
+remount_rw() {
+    mount -o remount,rw /
+}
+
+# Function to remount file system as read-only
+remount_ro() {
+    mount -o remount,ro /
+}
+
 install_update_tailscale() {
     echo "Checking if Tailscale is already installed..."
     if [ -f "$TAILSCALE_DIR/tailscale" ]; then