Merge branch 'next' of github.com:Start9Labs/start-os into rebase/integration/refactors

build/lib/depends

@@ -7,8 +7,8 @@ btrfs-progs
 ca-certificates
 cifs-utils
 containerd.io
-curl
 cryptsetup
+curl
 docker-ce
 docker-ce-cli
 docker-compose-plugin
@@ -23,6 +23,7 @@ iotop
 iw
 jq
 libavahi-client3
+libyajl2
 lm-sensors
 lshw
 lvm2
@@ -34,6 +35,7 @@ network-manager
 nvme-cli
 nyx
 openssh-server
+podman
 postgresql
 psmisc
 qemu-guest-agent

build/lib/docker-engine.slice

@@ -1,8 +0,0 @@
-[Unit]
-Description=Slice that limits docker resources 
-Before=slices.target
-
-[Slice]
-MemoryAccounting=true
-MemoryHigh=80%
-MemoryMax=85%

build/lib/scripts/chroot-and-upgrade

@@ -20,7 +20,13 @@ mount --bind /sys /media/embassy/next/sys
 mount --bind /proc /media/embassy/next/proc
 mount --bind /boot /media/embassy/next/boot
 
-chroot /media/embassy/next $@
+if [ -z "$*" ]; then
+    chroot /media/embassy/next
+    CHROOT_RES=$?
+else
+    chroot /media/embassy/next "$SHELL" -c "$*"
+    CHROOT_RES=$?
+fi
 
 umount /media/embassy/next/run
 umount /media/embassy/next/dev
@@ -28,10 +34,12 @@ umount /media/embassy/next/sys
 umount /media/embassy/next/proc
 umount /media/embassy/next/boot
 
-echo 'Upgrading...'
+if [ "$CHROOT_RES" -eq 0 ]; then
+    echo 'Upgrading...'
 
-touch /media/embassy/config/upgrade
+    touch /media/embassy/config/upgrade
 
-sync
+    sync
 
-reboot
+    reboot
+fi

build/lib/scripts/postinst

@@ -77,13 +77,12 @@ sed -i '/\(^\|#\)Compress=/c\Compress=yes' /etc/systemd/journald.conf
 sed -i '/\(^\|#\)SystemMaxUse=/c\SystemMaxUse=1G' /etc/systemd/journald.conf
 sed -i '/\(^\|#\)ForwardToSyslog=/c\ForwardToSyslog=no' /etc/systemd/journald.conf
 mkdir -p /etc/docker
-ln -sf /usr/lib/embassy/docker-engine.slice /etc/systemd/system/docker-engine.slice
 cat > /etc/docker/daemon.json << EOF
 {
-    "storage-driver": "overlay2",
-    "cgroup-parent": "docker-engine.slice"
+    "storage-driver": "overlay2"
 }
 EOF
+podman network create -d bridge --subnet 172.18.0.1/24 --opt com.docker.network.bridge.name=br-start9 start9
 mkdir -p /etc/nginx/ssl
 
 # fix to suppress docker warning, fixed in 21.xx release of docker cli: https://github.com/docker/cli/pull/2934
@@ -100,6 +99,7 @@ CookieAuthentication 1
 EOF
 
 rm -rf /var/lib/tor/*
+ln -sf /usr/lib/embassy/scripts/tor-check.sh /usr/bin/tor-check
 
 echo "fs.inotify.max_user_watches=1048576" > /etc/sysctl.d/97-embassy.conf
 

build/lib/scripts/tor-check.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+fail=$(printf " [\033[31m fail \033[0m]")
+pass=$(printf " [\033[32m pass \033[0m]")
+
+onion_list=(
+    "Start9|http://privacy34kn4ez3y3nijweec6w4g54i3g54sdv7r5mr6soma3w4begyd.onion"
+    "Mempool|http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion"
+    "DuckDuckGo|https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion"
+    "Brave Search|https://search.brave4u7jddbv7cyviptqjc7jusxh72uik7zt6adtckl5f4nwy2v72qd.onion"
+)
+
+# Check if ~/.startos/tor-check.list exists and read its contents if available
+if [ -f ~/.startos/tor-check.list ]; then
+    while IFS= read -r line; do
+        # Check if the line starts with a #
+        if [[ ! "$line" =~ ^# ]]; then
+            onion_list+=("$line")
+        fi
+    done < ~/.startos/tor-check.list
+fi
+
+echo "Testing connection to Onion Pages ..."
+
+for data in "${onion_list[@]}"; do
+    name="${data%%|*}"
+    url="${data#*|}"
+    if curl --socks5-hostname localhost:9050 "$url" > /dev/null 2>&1; then
+        echo " ${pass}: $name ($url) "
+    else
+        echo " ${fail}: $name ($url) "
+    fi
+done
+
+echo
+echo "Done."

build/raspberrypi/make-image.sh

@@ -15,6 +15,8 @@ ENVIRONMENT=$(cat ENVIRONMENT.txt)
 GIT_HASH=$(cat GIT_HASH.txt | head -c 7)
 DATE=$(date +%Y%m%d)
 
+ROOT_PART_END=7217792
+
 VERSION_FULL="$VERSION-$GIT_HASH"
 
 if [ -n "$ENVIRONMENT" ]; then
@@ -22,7 +24,7 @@ if [ -n "$ENVIRONMENT" ]; then
 fi
 
 TARGET_NAME=startos-${VERSION_FULL}-${DATE}_raspberrypi.img
-TARGET_SIZE=$[(6817791+1)*512]
+TARGET_SIZE=$[($ROOT_PART_END+1)*512]
 
 rm -f $TARGET_NAME
 truncate -s $TARGET_SIZE $TARGET_NAME
@@ -43,7 +45,7 @@ truncate -s $TARGET_SIZE $TARGET_NAME
     echo p
     echo 2
     echo 526336
-    echo 6817791
+    echo $ROOT_PART_END
     echo a
     echo 1
     echo w