diff --git a/ipk-source/sdxpinn-patch/CONTROL/preinst b/ipk-source/sdxpinn-patch/CONTROL/preinst index f9e34da..ea598a0 100755 --- a/ipk-source/sdxpinn-patch/CONTROL/preinst +++ b/ipk-source/sdxpinn-patch/CONTROL/preinst @@ -191,6 +191,7 @@ echo -e "\e[92miamromulan's SDXPINN repo source and key is installed.\e[0m" echo -e "\e[92mEnsuring mount-fix does not have a prerm\e[0m" mount -o remount,rw /real_rootfs rm /real_rootfs/usr/lib/opkg/info/sdxpinn-mount-fix.prerm +sleep 1 mount -o remount,ro /real_rootfs rm /usr/lib/opkg/info/sdxpinn-mount-fix.prerm echo -e "\e[92mEnsuring opkg reconizes needed archs\e[0m" diff --git a/opkg-feed/Packages b/opkg-feed/Packages index ac4c3ef..9f15b8e 100644 --- a/opkg-feed/Packages +++ b/opkg-feed/Packages @@ -88,8 +88,8 @@ Depends: sdxpinn-mount-fix Section: base Architecture: all Maintainer: Cameron Thompson iamromulan@github.com -MD5Sum: 94afa15dac3eb49b62f731bf526ccb79 -Size: 3027 +MD5Sum: e8c7475dbd472e3f9b174f6f34a3a53d +Size: 3014 Filename: sdxpinn-patch_2_all.ipk Source: github.com/iamromulan Description: A general first system patch for SDXPINN OpenWRT diff --git a/opkg-feed/Packages.gz b/opkg-feed/Packages.gz index 978c52e..a1df6a6 100644 Binary files a/opkg-feed/Packages.gz and b/opkg-feed/Packages.gz differ diff --git a/opkg-feed/Packages.log b/opkg-feed/Packages.log index 5c668cc..3e8fe2a 100644 --- a/opkg-feed/Packages.log +++ b/opkg-feed/Packages.log @@ -1,12 +1,12 @@ -Starting package analysis - Sun Jan 26 12:08:43 AM EST 2025 +Starting package analysis - Sun Jan 26 12:40:13 AM EST 2025 No update needed for atinout (version 0.9.1, MD5: 444eb87488bad1927b6ed069dedf7393, size: 4323) No update needed for luci-app-atinout-mod (version 1.3.4-20250119, MD5: 1ffee9ec8fe5723b8140bf2c21fea508, size: 4864) No update needed for luci-app-tailscale (version 1.2.3-2, MD5: 53c84c947c42d7518aecb4a6b8a9c5a8, size: 6501) No update needed for ookla-speedtest (version 1.2.0, MD5: b26e1909599f73cab40ea0281c5a6283, size: 1075696) No update needed for sdxpinn-console-menu (version 0.0.2, MD5: de75d2889510e92b57fc8a7ca087ced4, size: 7361) -Updating package info for sdxpinn-mount-fix... -Updated sdxpinn-mount-fix to version 1.3.0 with MD5: f6f785617ac6092d2e7e0396c3949b26 and size: 4691 -No update needed for sdxpinn-patch (version 2, MD5: 94afa15dac3eb49b62f731bf526ccb79, size: 3027) +No update needed for sdxpinn-mount-fix (version 1.3.0, MD5: f6f785617ac6092d2e7e0396c3949b26, size: 4691) +Updating package info for sdxpinn-patch... +Updated sdxpinn-patch to version 2 with MD5: e8c7475dbd472e3f9b174f6f34a3a53d and size: 3014 No update needed for sdxpinn-quecmanager (version 1.0.1, MD5: cb96c5ec96c2166f39d989f277ebc0f7, size: 722109) No update needed for sdxpinn-quecmanager-beta (version 1.1.1-2, MD5: bcb2775216382f6a479cc10983df8e0d, size: 1050194) No update needed for sms-tool (version 2025.1.19-APmod-iamromulan, MD5: 83dc8bfd2d4ac8d8952a2a95b2be943f, size: 13687) @@ -14,4 +14,4 @@ No update needed for socat-at-bridge (version 1.1.1, MD5: 2fd73d7679b3db54113d93 No update needed for tailscale (version 1.78.1-2, MD5: baa4d97ba49aa42ef104accba2dc2fd8, size: 9882856) No update needed for tailscaled (version 1.78.1-4, MD5: 647b4d3c6e51f700dd96362f92f20b54, size: 17960998) Package file and signature updated successfully. -Package analysis completed - Sun Jan 26 12:08:43 AM EST 2025 +Package analysis completed - Sun Jan 26 12:40:13 AM EST 2025 diff --git a/opkg-feed/Packages.sig b/opkg-feed/Packages.sig index b885f9a..90c5d0f 100644 --- a/opkg-feed/Packages.sig +++ b/opkg-feed/Packages.sig @@ -1,2 +1,2 @@ untrusted comment: signed by key 6262698f038d1226 -RWRiYmmPA40SJs7uILFkj9CB3I5a/BVRE0ey7Ab39VdgJOdZjMCtlRoOxrZ4DcVC7co4FCJFVCDN2r4LIrbW6LI7gTQLmjYu8gc= +RWRiYmmPA40SJqThbK9jvk1W8lTZwl5KnlL4yjEuNXk2P495tzsNlCIpmacbqqjhRsxahCl4rSQchTMDGx9Jtc3fY3WTMyzf0A8= diff --git a/opkg-feed/sdxpinn-patch_2_all.ipk b/opkg-feed/sdxpinn-patch_2_all.ipk index d4aadf0..8e59bee 100644 Binary files a/opkg-feed/sdxpinn-patch_2_all.ipk and b/opkg-feed/sdxpinn-patch_2_all.ipk differ diff --git a/rcPCIe_SDXPINN_toolkit.sh b/rcPCIe_SDXPINN_toolkit.sh index e335fe3..b16c918 100644 --- a/rcPCIe_SDXPINN_toolkit.sh +++ b/rcPCIe_SDXPINN_toolkit.sh @@ -57,38 +57,24 @@ install_mount_fix() { echo -e "\033[31mI was expecting either /etc or /real_rootfs to be a mount point.\033[0m" exit 1 fi - - # Check if /etc is mounted - if grep -qs '/etc ' /proc/mounts; then - echo "Unmounting /etc..." - umount -lf /etc - fi - - # Check if /real_rootfs is mounted - if grep -qs '/real_rootfs ' /proc/mounts; then - # Echo message in red - echo -e "\033[31mThe environment has already been setup. If you want to undo the changes temporarily run service mount-fix stop.\033[0m" - echo -e "\033[31mWant to uninstal? Then run opkg remove sdxpinn-mount-fix\033[0m" - exit 1 - fi # Install mount-fix cd /tmp - curl -O https://raw.githubusercontent.com/$GITUSER/$GITREPO/$GITTREE/opkg-feed/sdxpinn-mount-fix_1.2.0_aarch64_cortex-a53.ipk - opkg install sdxpinn-mount-fix_1.2.0_aarch64_cortex-a53.ipk + curl -O https://raw.githubusercontent.com/$GITUSER/$GITREPO/$GITTREE/opkg-feed/sdxpinn-mount-fix_1.3.0_aarch64_cortex-a53.ipk + opkg install sdxpinn-mount-fix_1.3.0_aarch64_cortex-a53.ipk } basic_55x_setup() { overlay_check || return - echo "src/gz iamromulan-SDXPINN-repo https://raw.githubusercontent.com/iamromulan/quectel-rgmii-toolkit/SDXPINN/opkg-feed" >> /etc/opkg/customfeeds.conf cd /tmp - curl -O https://raw.githubusercontent.com/$GITUSER/$GITREPO/$GITTREE/opkg-feed/iamromulan-SDXPINN-repo.key - opkg-key add /tmp/iamromulan-SDXPINN-repo.key + curl -O https://raw.githubusercontent.com/$GITUSER/$GITREPO/$GITTREE/opkg-feed/sdxpinn-patch_2_all.ipk + opkg install sdxpinn-patch_2_all.ipk opkg update echo -e "\e[92m" - echo "iamromulan's ipk/opkg repo added!...." - echo -e "\e[0m" + echo "iamromulan's ipk/opkg repo added!" + echo "Installing basic packages..." opkg install atinout luci-app-atinout-mod sdxpinn-console-menu - + echo "Patching default Quectel login binary..." + echo -e "\e[0m" # Get rid of the Quectel Login Binary opkg install shadow-login mv /bin/login /bin/login.old @@ -111,9 +97,7 @@ basic_55x_setup() { service uhttpd enable - sleep 2 service dropbear enable - sleep 2 service uhttpd start service dropbear start @@ -278,18 +262,15 @@ tailscale_menu() { done } -# Function to install, update, or remove Tailscale +# Function to install tailscale install_update_tailscale() { + overlay_check || return echo -e "\e[1;31mInstalling Tailscale 1.78.1...\e[0m" - cd /tmp - curl -O https://raw.githubusercontent.com/$GITUSER/$GITREPO/$GITTREE/opkg-feed/tailscaled_1.78.1-4_aarch64_cortex-a53.ipk - curl -O https://raw.githubusercontent.com/$GITUSER/$GITREPO/$GITTREE/opkg-feed/tailscale_1.78.1-2_aarch64_cortex-a53.ipk - opkg install tailscaled_1.78.1-4_aarch64_cortex-a53.ipk - opkg install tailscale_1.78.1-2_aarch64_cortex-a53.ipk + opkg update + opkg install luci-app-tailscale echo -e "\e[1;32mTailscale version 1.78.1 installed\e[0m" - echo -e "\e[1;32mNEW! The luci-app-tailscale package is avalible in iamromulan's repo!\e[0m" - echo -e "\e[1;32mInstall from Luci Software after installing the repo.\e[0m" + echo -e "\e[1;32mNEW! Tailscale can be configured from Luci\e[0m" } @@ -297,25 +278,21 @@ install_update_tailscale() { configure_tailscale() { while true; do echo "Configure Tailscale" - echo -e "\e[38;5;40m1) Enable Tailscale Web UI at http://192.168.225.1:8088 (Gateway on port 8088)\e[0m" # Green - echo -e "\e[38;5;196m2) Disable Tailscale Web UI\e[0m" # Red - echo -e "\e[38;5;27m3) Connect to Tailnet\e[0m" # Brown - echo -e "\e[38;5;87m4) Connect to Tailnet with SSH ON\e[0m" # Light cyan - echo -e "\e[38;5;105m5) Reconnect to Tailnet with SSH OFF\e[0m" # Light magenta - echo -e "\e[38;5;172m6) Disconnect from Tailnet (reconnects at reboot)\e[0m" # Light yellow - echo -e "\e[1;31m7) Logout from tailscale account\e[0m" - echo -e "\e[38;5;27m8) Return to Tailscale Menu\e[0m" + echo -e "\e[38;5;27m1) Connect to Tailnet\e[0m" # Brown + echo -e "\e[38;5;87m2) Connect to Tailnet with SSH ON\e[0m" # Light cyan + echo -e "\e[38;5;105m3) Reconnect to Tailnet with SSH OFF\e[0m" # Light magenta + echo -e "\e[38;5;172m4) Disconnect from Tailnet (reconnects at reboot)\e[0m" # Light yellow + echo -e "\e[1;31m5) Logout from tailscale account\e[0m" + echo -e "\e[38;5;27m6) Return to Tailscale Menu\e[0m" read -p "Enter your choice: " config_choice case $config_choice in - 1) echo -e "\e[38;5;196mNot for the 551 yet\e[0m" ;; # Red - 2) echo -e "\e[38;5;196mNot for the 551 yet\e[0m" ;; # Red + 1) tailscale up --accept-dns=false --reset ;; + 2) tailscale up --ssh --accept-dns=false --reset ;; 3) tailscale up --accept-dns=false --reset ;; - 4) tailscale up --ssh --accept-dns=false --reset ;; - 5) tailscale up --accept-dns=false --reset ;; - 6) tailscale down ;; - 7) tailscale logout ;; - 8) break ;; + 4) tailscale down ;; + 5) tailscale logout ;; + 6) break ;; *) echo "Invalid option" ;; esac done