Remove initd service (#81)

stage2/00-sys-tweaks/files/rc.local

@@ -11,20 +11,13 @@
 #
 # By default this script does nothing.
 
-# Print the IP address
-_IP=$(hostname -I) || true
-
-if [ "$_IP" ]; then
-    printf "My IP address is %s\n" "$_IP"
-fi
-
 UMBREL_BOOT_SCRIPT=/home/umbrel/umbrel/scripts/umbrel-os/boot
 
 # Check for statuses directory
 if [ -x "$UMBREL_BOOT_SCRIPT" ]; then
     "$UMBREL_BOOT_SCRIPT" || exit 1
 else
-    echo "There's no boot script at $UMBREL_BOOT_SCRIPT"
+    echo "Error: No boot script found at $UMBREL_BOOT_SCRIPT"
 fi
 
 exit 0

stage2/05-docker-compose/01-run.sh

@@ -7,25 +7,10 @@ on_chroot << EOF
 pip3 install docker-compose
 mkdir /home/${FIRST_USER_NAME}/umbrel
 cd /home/${FIRST_USER_NAME}/umbrel
-curl -L https://github.com/getumbrel/umbrel/archive/v${UMBREL_VERSION}.tar.gz | tar -xz --strip-components=1
+git clone https://github.com/getumbrel/umbrel.git .
 chown -R ${FIRST_USER_NAME}:${FIRST_USER_NAME} /home/${FIRST_USER_NAME}
 EOF
 
-# Docker compose service
-on_chroot << EOF
-mkdir -p /etc/init.d
-mkdir -p /etc/rc2.d
-mkdir -p /etc/rc3.d
-mkdir -p /etc/rc4.d
-mkdir -p /etc/rc5.d
-mkdir -p /etc/rc0.d
-mkdir -p /etc/rc1.d
-mkdir -p /etc/rc6.d
-EOF
-
-echo "Copying the umbrel service to rootfs (etc/init.d)"
-install -m 755 files/umbrel "${ROOTFS_DIR}"/etc/init.d/umbrel
-
 echo "Pulling Docker images required to run Umbrel services"
 
 wget -q "https://raw.githubusercontent.com/getumbrel/umbrel/v${UMBREL_VERSION}/docker-compose.yml"

stage2/05-docker-compose/files/umbrel

@@ -1,66 +0,0 @@
-#!/bin/bash
-
-set -e
-
-### BEGIN INIT INFO
-# Provides:          Umbrel service
-# Required-Start:    $syslog $remote_fs docker
-# Required-Stop:     $syslog $remote_fs docker
-# Should-Start:      cgroupfs-mount cgroup-lite
-# Should-Stop:       cgroupfs-mount cgroup-lite
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts Umbrel
-# Description:       Start Umbrel
-### END INIT INFO
-NAME="umbrel"
-DESCRIPTION="Umbrel service"
-SCRIPTNAME=/etc/init.d/$NAME
-UMBREL_ROOT=/home/umbrel/umbrel
-
-case "$1" in
-  	start)
-        if [ -x $UMBREL_ROOT/scripts/start ]; then
-			echo "Starting Umbrel..."
-			echo
-			if [ -f /etc/default/umbrel ]; then
-				echo "Loading Umbrel OS environment variables..."
-				source /etc/default/umbrel
-			fi
-		    cd $UMBREL_ROOT
-			./scripts/start
-            exit 0
-        else
-            echo "Cannot start umbrel service. No start script found in $UMBREL_ROOT"
-            exit 1
-        fi
-		;;
-	stop)
-        if [ -x $UMBREL_ROOT/scripts/stop ]; then
-		    echo "Stopping Umbrel..."
-		    cd $UMBREL_ROOT
-		    ./scripts/stop
-            exit 0
-        else
-            echo "Cannot stop umbrel service. No stop script found in $UMBREL_ROOT"
-            exit 1
-        fi
-		;;
-	status)
-		if [ -x $UMBREL_ROOT/scripts/status ]; then
-		    echo "Getting Umbrel status..."
-		    cd $UMBREL_ROOT
-		    ./scripts/status
-            exit 0
-        else
-            echo "Cannot get umbrel service's status. No status script found in $UMBREL_ROOT"
-            exit 1
-        fi
-		;;
-	*)
-		echo "Either 'start', 'stop', or 'status'"
-		exit 1
-        ;;
-esac
-
-exit 0