Replace initd with systemd (#100)

scripts/configure

@@ -42,7 +42,11 @@ if [ "$BITCOIN_NETWORK" != "mainnet" ] && [ "$BITCOIN_NETWORK" != "testnet" ] &&
 fi
 
 echo
-echo "Configuring Umbrel for $BITCOIN_NETWORK"
+if [[ -f "${UMBREL_ROOT}/statuses/configured" ]]; then
+  echo "Reconfiguring Umbrel for $BITCOIN_NETWORK"
+else
+  echo "Configuring Umbrel for $BITCOIN_NETWORK"
+fi
 echo 
 
 
@@ -189,8 +193,7 @@ echo "Pulling Umbrel Docker images"
 echo
 docker-compose pull --quiet
 
-# Create configured status (used by the boot script on Umbrel OS
+# Create configured status
-# to check if Umbrel is configured or not)
 touch "$UMBREL_ROOT"/statuses/configured
 
 echo "Configuration successful"

scripts/umbrel-os/boot

@@ -3,49 +3,49 @@
 UMBREL_ROOT="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))/../.."
 UMBREL_OS_SCRIPTS="${UMBREL_ROOT}/scripts/umbrel-os"
 
-# Mount and/or format external storage
+# Creates, enables and starts a systemd service
-"${UMBREL_OS_SCRIPTS}/external-storage-mounter" || exit 1
+enable_service() {
-
+  service="${1}"
-if [ ! -f "$UMBREL_ROOT"/statuses/configured ]; then
+  if [ ! -f "/etc/systemd/system/${service}" ]; then
-  echo "statuses/configured not found. Looks like the first boot..."
+    echo "Setting up ${service}"
-  echo "Configuring Umbrel now..."
+    if [ ! -f "${UMBREL_OS_SCRIPTS}/services/${service}" ]; then
-  echo
+      echo "Error: No service file found at ${UMBREL_OS_SCRIPTS}/services/${service}"
-  if [ -f "$UMBREL_ROOT"/scripts/configure ]; then
-    cd "$UMBREL_ROOT"
-    ./scripts/configure || exit 1
-  else 
-    echo "Error: No configuration script not found at $UMBREL_ROOT/scripts/configure"
       exit 1
     fi
+    echo "Copying ${service} to /etc/systemd/system/${service}"
+    cp "${UMBREL_OS_SCRIPTS}/services/${service}" "/etc/systemd/system/${service}"
+
+    echo "Enabling ${service}..."
+    systemctl enable "${service}"
+
+    echo "Starting ${service}..."
+    systemctl start "${service}"
+  fi
+}
+
+# Configure Umbrel on first boot
+# We assume that it's the first boot if Umbrel hasn't been configured
+if [ ! -f "${UMBREL_ROOT}/statuses/configured" ]; then
+  echo
+  echo "======================================"
+  echo "============ FIRST BOOT =============="
+  echo "=========== hello world! ============="
+  echo "======================================"
   echo 
-  echo "Configuration complete. Setting up Umbrel initd startup service..."
+  echo "Configuring Umbrel..."
   echo
-  if [ ! -f /etc/rc2.d/S01umbrel ]; then
+  if [ -f "${UMBREL_ROOT}/scripts/configure" ]; then
-    echo "Creating multiple runlevel symlinks..."
+    cd "$UMBREL_ROOT"
-    ln -s /etc/init.d/umbrel /etc/rc0.d/K01umbrel
+    NETWORK=mainnet ./scripts/configure || exit 1
-    ln -s /etc/init.d/umbrel /etc/rc1.d/K01umbrel
-    ln -s /etc/init.d/umbrel /etc/rc2.d/S01umbrel
-    ln -s /etc/init.d/umbrel /etc/rc3.d/S01umbrel
-    ln -s /etc/init.d/umbrel /etc/rc4.d/S01umbrel
-    ln -s /etc/init.d/umbrel /etc/rc5.d/S01umbrel
-    ln -s /etc/init.d/umbrel /etc/rc6.d/K01umbrel
-    echo "Enabling service defaults..."
-    update-rc.d umbrel defaults || exit 1
-    echo "Enabling startup service..."
-    update-rc.d umbrel enable || exit 1
-    echo "Starting service now..."
-    /etc/init.d/umbrel start
   else 
-    echo "Umbrel initd startup service already exists..."
+    echo "Error: No configuration script found at ${UMBREL_ROOT}/scripts/configure"
+    exit 1
   fi
 fi
 
-# Display connection details on the TTY
+# Enable all services
-if [ -x "$(command -v umbrel-details)" ]; then
+enable_service "umbrel-external-storage.service"
-  # We run this in the background because it waits for the Tor hidden service
+enable_service "umbrel-startup.service"
-  # to be created on first boot. rc.local needs to exit so the boot process
+enable_service "umbrel-connection-details.service"
-  # can continue.
-  umbrel-details &
-fi
 
 exit 0

scripts/umbrel-os/is-on-external-storage → scripts/umbrel-os/external-storage/is-mounted

@@ -5,6 +5,6 @@ set -euo pipefail
 # This script returns a non-zero exit code if $UMBREL_ROOT is NOT
 # mounted on external storage.
 
-UMBREL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)"
+UMBREL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../../..)"
 
 df -h "${UMBREL_ROOT}" | grep --quiet '/dev/sd'

scripts/umbrel-os/external-storage-mounter → scripts/umbrel-os/external-storage/mount

@@ -13,7 +13,7 @@ set -euo pipefail
 # - - Install Umbrel on it
 # - Bind mount the external installation on top of the local installation
 
-UMBREL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)"
+UMBREL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../../..)"
 MOUNT_POINT="/mnt/data"
 EXTERNAL_UMBREL_ROOT="${MOUNT_POINT}/umbrel"
 
@@ -83,7 +83,7 @@ unmount_partition () {
 main () {
   echo "Running external storage mount script..."
   check_root
-  check_dependencies sed wipefs parted mount sync
+  check_dependencies sed wipefs parted mount sync umount
 
   block_devices=$(list_block_devices)
   no_of_block_devices=$(list_block_devices | wc -l)
@@ -91,7 +91,7 @@ main () {
   if [[ $no_of_block_devices -lt 1 ]]; then
     echo "No block devices found"
     echo "Exiting mount script without doing anything"
-    exit
+    exit 1
   fi
 
   if [[ $no_of_block_devices -gt 1 ]]; then
@@ -107,7 +107,9 @@ main () {
   echo "Found device \"${block_device_model}\""
 
   echo "Checking if device contains an Umbrel install..."
+
   mount_partition "${partition_path}"
+
   if [[ -f "${EXTERNAL_UMBREL_ROOT}"/.umbrel ]]; then
     echo "Yes, it does"
   else
@@ -136,7 +138,7 @@ main () {
   echo "Checking Umbrel root is now on external storage..."
   sync
   sleep 1
-  "${UMBREL_ROOT}/scripts/umbrel-os/is-on-external-storage"
+  "${UMBREL_ROOT}/scripts/umbrel-os/external-storage/is-mounted"
 
   echo "Mount script completed successfully!"
 }

scripts/umbrel-os/services/umbrel-connection-details.service

@@ -0,0 +1,20 @@
+# Umbrel Connection Details Logger (TTY) 
+# Installed at /etc/systemd/system/umbrel-connection-details.service
+
+[Unit]
+Description=Connection Details
+Requires=umbrel-startup.service
+After=umbrel-startup.service
+
+[Service]
+Type=oneshot
+Restart=no
+ExecStart=/usr/local/bin/umbrel-details
+User=root
+Group=root
+StandardOutput=tty
+TTYPath=/dev/tty1
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

scripts/umbrel-os/services/umbrel-external-storage.service

@@ -0,0 +1,19 @@
+# Umbrel External Storage Mounter
+# Installed at /etc/systemd/system/umbrel-external-storage.service
+
+[Unit]
+Description=External Storage Mounter
+
+[Service]
+Type=oneshot
+Restart=no
+ExecStart=/home/umbrel/umbrel/scripts/umbrel-os/external-storage/mount
+User=root
+Group=root
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=external storage mounter
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

scripts/umbrel-os/services/umbrel-startup.service

@@ -0,0 +1,25 @@
+# Umbrel Startup Service
+# Installed at /etc/systemd/system/umbrel-startup.service
+
+[Unit]
+Description=Umbrel Startup Service
+Requires=umbrel-external-storage.service
+After=umbrel-external-storage.service
+Wants=network-online.target
+After=network-online.target
+Wants=docker.service
+After=docker.service
+
+[Service]
+Type=forking
+TimeoutSec=infinity
+ExecStart=/home/umbrel/umbrel/scripts/start
+User=root
+Group=root
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=umbrel startup
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target