From 9b2b0c345caba9fc21d038a5d73e7fa8debb1cdc Mon Sep 17 00:00:00 2001
From: Taylor Helsper <tehelsper@gmail.com>
Date: Wed, 11 May 2022 23:40:57 -0500
Subject: [PATCH] Debian is now detected as 64-bit

---
 rootfs/debian/etc/apparmor.d/local/system_tor    |  2 ++
 .../usr/share/mynode/mynode_device_info.sh       |  2 +-
 setup/setup_device.sh                            | 16 ++++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 rootfs/debian/etc/apparmor.d/local/system_tor

diff --git a/rootfs/debian/etc/apparmor.d/local/system_tor b/rootfs/debian/etc/apparmor.d/local/system_tor
new file mode 100644
index 00000000..af33d93c
--- /dev/null
+++ b/rootfs/debian/etc/apparmor.d/local/system_tor
@@ -0,0 +1,2 @@
+/etc/torrc.d/ r,
+/etc/torrc.d/** r,
diff --git a/rootfs/standard/usr/share/mynode/mynode_device_info.sh b/rootfs/standard/usr/share/mynode/mynode_device_info.sh
index 932c73b9..96fd96b1 100644
--- a/rootfs/standard/usr/share/mynode/mynode_device_info.sh
+++ b/rootfs/standard/usr/share/mynode/mynode_device_info.sh
@@ -14,7 +14,7 @@ IS_32_BIT=0
 IS_64_BIT=0
 DEVICE_TYPE="unknown"
 MODEL=$(tr -d '\0' < /proc/device-tree/model) || MODEL="unknown"
-uname -a | grep amd64 && IS_X86=1 || true
+uname -a | grep amd64 && IS_X86=1 && IS_64_BIT=1 || true
 if [[ $MODEL == *"Rock64"* ]]; then 
     IS_ARMBIAN=1
     IS_ROCK64=1
diff --git a/setup/setup_device.sh b/setup/setup_device.sh
index 7c41c234..2b384fa3 100755
--- a/setup/setup_device.sh
+++ b/setup/setup_device.sh
@@ -29,7 +29,7 @@ IS_64_BIT=0
 IS_UNKNOWN=0
 DEVICE_TYPE="unknown"
 MODEL=$(cat /proc/device-tree/model) || IS_UNKNOWN=1
-uname -a | grep amd64 && IS_X86=1 && IS_UNKNOWN=0 || true
+uname -a | grep amd64 && IS_X86=1 && IS_64_BIT=1 && IS_UNKNOWN=0 || true
 if [[ $MODEL == *"Rock64"* ]]; then
     IS_ARMBIAN=1
     IS_ROCK64=1
@@ -918,13 +918,6 @@ touch /home/bitcoin/.mynode/install_dojo
 # SKIPPING WARDEN - OPTIONAL APP
 
 
-# Mark dynamic applications as defalt application
-# ...
-
-# Upgrade Dyanmic Applications
-mynode-manage-apps upgrade
-
-
 # Make sure we are using legacy iptables
 update-alternatives --set iptables /usr/sbin/iptables-legacy || true
 update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy || true
@@ -939,6 +932,13 @@ sync
 sleep 1
 
 
+# Mark dynamic applications as defalt application
+# ... (none yet)
+
+# Upgrade Dyanmic Applications (must be done after file installation)
+# mynode-manage-apps upgrade # not yet working during setup process
+
+
 # Enable fan control
 if [ $IS_ROCKPRO64 = 1 ]; then
     systemctl enable fan_control