Merge https://github.com/UmbrelOS-Tweaks/base into new

.github/workflows/on-push.yml

@@ -4,7 +4,7 @@ on: ["push", "pull_request"]
 jobs:
     build:
 
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
 
         steps:
 
@@ -14,7 +14,7 @@ jobs:
           run: sudo apt-get update
 
         - name: Install dependencies
-          run: sudo apt-get -y install quilt qemu-user-static debootstrap bsdtar
+          run: sudo apt-get -y install quilt qemu-user-static debootstrap libarchive-tools
 
         - name: Nuke current Docker installation
           run: |

.github/workflows/on-tag-only.yml

@@ -8,7 +8,7 @@ on:
 jobs:
     build:
 
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
 
         steps:
 
@@ -18,7 +18,7 @@ jobs:
           run: sudo apt-get update
 
         - name: Install dependencies
-          run: sudo apt-get -y install quilt qemu-user-static debootstrap bsdtar
+          run: sudo apt-get -y install quilt qemu-user-static debootstrap libarchive-tools
 
         - name: Nuke current Docker installation
           run: |

config

@@ -6,4 +6,4 @@ FIRST_USER_PASS=moneyprintergobrrr
 ENABLE_SSH=1
 BUILD_SCRIPTS="Umbrel OS official build scripts"
 BUILD_SCRIPTS_REPO="https://github.com/getumbrel/umbrel-os"
-UMBREL_VERSION=0.2.15
+UMBREL_VERSION=0.3.2

depends

@@ -17,3 +17,4 @@ file
 git
 lsmod:kmod
 bc
+docker

scripts/dependencies_check

@@ -28,11 +28,26 @@ dependencies_check()
 		false
 	fi
 
+    # If we're building on a native arm platform, we don't need to check for
+    # binfmt_misc or require it to be loaded.
 
-	if ! grep -q "/proc/sys/fs/binfmt_misc" /proc/mounts; then
-		echo "Module binfmt_misc not loaded in host"
-		echo "Please run:"
-		echo "  sudo modprobe binfmt_misc"
-		exit 1
+	binfmt_misc_required=1
+
+	case $(uname -m) in
+		aarch64)
+			binfmt_misc_required=0
+			;;
+		arm*)
+			binfmt_misc_required=0
+			;;
+	esac
+
+	if [[ "${binfmt_misc_required}" == "1" ]]; then
+		if ! grep -q "/proc/sys/fs/binfmt_misc" /proc/mounts; then
+			echo "Module binfmt_misc not loaded in host"
+			echo "Please run:"
+			echo "  sudo modprobe binfmt_misc"
+			exit 1
+		fi
 	fi
 }

stage1/00-boot-files/files/cmdline.txt

@@ -1 +1 @@
-usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
+usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait

stage2/00-sys-tweaks/00-patches/04-resize-init.diff

@@ -1,5 +1,5 @@
 --- stage2.orig/rootfs/boot/cmdline.txt
 +++ stage2/rootfs/boot/cmdline.txt
 @@ -1 +1 @@
--usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
-+usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh
+-usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait
++usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh

stage2/03-install-umbrel/00-packages

@@ -2,3 +2,4 @@ git
 fswatch
 jq
 python3-qrcode
+unattended-upgrades