From 223e704adc646dcb1914d9af87c495750db93095 Mon Sep 17 00:00:00 2001
From: Zach Brown <git@prozach.org>
Date: Tue, 9 Apr 2024 17:08:26 +0000
Subject: [PATCH] Fix OPKG installer

---
 RMxxx_rgmii_toolkit.sh |  1 +
 installentware.sh      | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/RMxxx_rgmii_toolkit.sh b/RMxxx_rgmii_toolkit.sh
index b03ae9a..1788c7c 100644
--- a/RMxxx_rgmii_toolkit.sh
+++ b/RMxxx_rgmii_toolkit.sh
@@ -1095,6 +1095,7 @@ echo "                                           :+##+.            "
 	    echo -e "\e[1;32mThe fast.com test tops out at 40Mbps on the modem\e[0m"
             ;;
 	11) 
+        ensure_entware_installed
 	    echo -e "\e[1;32mOpenSSH Server\e[0m"
         remount_rw
 
diff --git a/installentware.sh b/installentware.sh
index 354c6b7..2c48849 100644
--- a/installentware.sh
+++ b/installentware.sh
@@ -83,6 +83,7 @@ create_opt_mount() {
     echo -e '\033[32mInfo: Setting up /opt mount to /usrdata/opt...\033[0m'
     cat <<EOF > /lib/systemd/system/opt.mount
 [Unit]
+Description=Bind /usrdata/opt to /opt
 After=systemrw.mount sockets.target
 Before=basic.target
 RequiresMountsFor=/usrdata
@@ -205,10 +206,10 @@ opkg update && opkg install shadow-login shadow-passwd
     fi
 
     # Replace the login and passwd binaries and set home for root to a writable directory
-    mv /etc/shadow /opt/etc/shadow
-    mv /etc/passwd /opt/etc/passwd
-    ln -s /opt/etc/shadow /etc/shadow
-    ln -s /opt/etc/passwd /etc/passwd
+    rm /opt/etc/shadow
+    rm /opt/etc/passwd
+    cp /etc/shadow /opt/etc/
+    cp /etc/passwd /opt/etc
     mkdir /usrdata/root
     mkdir /usrdata/root/bin
     touch /usrdata/root/.profile
@@ -224,9 +225,13 @@ opkg update && opkg install shadow-login shadow-passwd
 
     # Install basic and useful utilites
     opkg install mc
+    ln -sf /opt/bin/mc /bin
     opkg install htop
+    ln -sf /opt/bin/htop /bin
     opkg install dfc
+    ln -sf /opt/bin/dfc /bin
     opkg install lsof
+    ln -sf /opt/bin/lsof /bin
 
 # Remount filesystem as read-only
 mount -o remount,ro /