fall back to using dpkg when arch is detected as x86_64 to make sure we're not really on an i386 image to prevent wrong s6 overlay version being downloaded on a 32 bit image

Signed-off-by: Adam Warner <[email protected]>

Author: PromoFaux

src/s6/debian-root/usr/local/bin/install.sh

@@ -17,9 +17,14 @@ detect_arch() {
     S6_ARCH="armhf";;
   armv7l)
     S6_ARCH="armhf";;
-  i386)
-    S6_ARCH="i686";;
-esac
+  x86_64)
+    # arch returns x86_64 on linux/i386, causing the wrong s6-overlay to be downloaded
+    # fallback to dpkg to check the architecture and download the i686 s6-overlay if necessary
+    ARCH_CHECK=$(dpkg --print-architecture)
+    if [ "$ARCH_CHECK" == "i386" ]; then
+      S6_ARCH="i686"
+    fi    
+  esac
 }