Clean-up S6 config files (#917)

(cherry picked from commit 38ed452)
devpow112 · Dec 20, 2024 · e925229 · e925229
1 parent 8496589
commit e925229
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 72 deletions.
diff --git a/root/etc/s6-overlay/s6-rc.d/base-apply-permissions/dependencies b/root/etc/s6-overlay/s6-rc.d/base-apply-permissions/dependencies
diff --git a/root/etc/s6-overlay/s6-rc.d/base-apply-permissions/dependencies.d/base-set-up-user b/root/etc/s6-overlay/s6-rc.d/base-apply-permissions/dependencies.d/base-set-up-user
diff --git a/...s6-overlay/scripts/base-apply-permissions → ...verlay/s6-rc.d/base-apply-permissions/run b/...s6-overlay/scripts/base-apply-permissions → ...verlay/s6-rc.d/base-apply-permissions/run
diff --git a/root/etc/s6-overlay/s6-rc.d/base-apply-permissions/up b/root/etc/s6-overlay/s6-rc.d/base-apply-permissions/up
@@ -1 +1 @@
-/etc/s6-overlay/scripts/base-apply-permissions
+/etc/s6-overlay/s6-rc.d/base-apply-permissions/run
diff --git a/root/etc/s6-overlay/s6-rc.d/base-set-up-timezone/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/base-set-up-timezone/dependencies.d/base
diff --git a/...c/s6-overlay/scripts/base-set-up-timezone → ...-overlay/s6-rc.d/base-set-up-timezone/run b/...c/s6-overlay/scripts/base-set-up-timezone → ...-overlay/s6-rc.d/base-set-up-timezone/run
diff --git a/root/etc/s6-overlay/s6-rc.d/base-set-up-timezone/up b/root/etc/s6-overlay/s6-rc.d/base-set-up-timezone/up
@@ -1 +1 @@
-/etc/s6-overlay/scripts/base-set-up-timezone
+/etc/s6-overlay/s6-rc.d/base-set-up-timezone/run
diff --git a/root/etc/s6-overlay/s6-rc.d/base-set-up-user/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/base-set-up-user/dependencies.d/base
diff --git a/root/etc/s6-overlay/scripts/base-set-up-user → ...c/s6-overlay/s6-rc.d/base-set-up-user/run b/root/etc/s6-overlay/scripts/base-set-up-user → ...c/s6-overlay/s6-rc.d/base-set-up-user/run
diff --git a/root/etc/s6-overlay/s6-rc.d/base-set-up-user/up b/root/etc/s6-overlay/s6-rc.d/base-set-up-user/up
@@ -1 +1 @@
-/etc/s6-overlay/scripts/base-set-up-user
+/etc/s6-overlay/s6-rc.d/base-set-up-user/run
diff --git a/test/root/etc/s6-overlay/s6-rc.d/test/dependencies b/test/root/etc/s6-overlay/s6-rc.d/test/dependencies
diff --git a/test/root/etc/s6-overlay/s6-rc.d/test/dependencies.d/base-apply-permissions b/test/root/etc/s6-overlay/s6-rc.d/test/dependencies.d/base-apply-permissions
diff --git a/test/root/etc/s6-overlay/s6-rc.d/test/dependencies.d/base-set-up-timezone b/test/root/etc/s6-overlay/s6-rc.d/test/dependencies.d/base-set-up-timezone
diff --git a/test/root/etc/s6-overlay/s6-rc.d/test/dependencies.d/base-set-up-user b/test/root/etc/s6-overlay/s6-rc.d/test/dependencies.d/base-set-up-user
diff --git a/test/root/etc/s6-overlay/s6-rc.d/test/run b/test/root/etc/s6-overlay/s6-rc.d/test/run
@@ -1,4 +1,65 @@
 #!/command/with-contenv bash
 
 set -e
-exec /etc/s6-overlay/scripts/test
+
+echo "Platform: $(uname -m)"
+
+result=0
+
+echo "=> Check '/.base-apply-permissions-complete' exists"
+
+if [ -e /.base-apply-permissions-complete ]; then
+  echo "=> Success! File '/.base-apply-permissions-complete' exists"
+else
+  echo "=> Failed! File '/.base-apply-permissions-complete' missing"
+
+  result=1
+fi
+
+echo "=> Check '/.base-set-up-timezone-complete' exists"
+
+if [ -e /.base-set-up-timezone-complete ]; then
+  echo "=> Success! File '/.base-set-up-timezone-complete' exists"
+else
+  echo "=> Failed! File '/.base-set-up-timezone-complete' missing"
+
+  result=1
+fi
+
+echo "=> Check '/.base-set-up-user-complete' exists"
+
+if [ -e /.base-set-up-user-complete ]; then
+  echo "=> Success! File '/.base-set-up-user-complete' exists"
+else
+  echo "=> Failed! File '/.base-set-up-user-complete' missing"
+
+  result=1
+fi
+
+echo "=> Check '/etc/timezone' is correct"
+
+timezone=$(cat /etc/timezone)
+
+if [[ "$timezone" == "$TZ" ]]; then
+  echo "=> Success! File '/etc/timezone' correct"
+else
+  echo "=> Failed! File '/etc/timezone' incorrect ($timezone => $TZ)"
+
+  result=1
+fi
+
+echo "=> Check '/etc/localtime' is correct"
+
+localtime=$(readlink /etc/localtime)
+expected="/usr/share/zoneinfo/$TZ"
+
+if [[ "$localtime" == "$expected" ]]; then
+  echo "=> Success! File '/etc/localtime' correct"
+else
+  echo "=> Failed! File '/etc/localtime' incorrect ($localtime => $expected)"
+
+  result=1
+fi
+
+exit $result
+
diff --git a/test/root/etc/s6-overlay/scripts/test b/test/root/etc/s6-overlay/scripts/test
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/etc/s6-overlay/scripts/base-apply-permissions
		/etc/s6-overlay/s6-rc.d/base-apply-permissions/run
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/etc/s6-overlay/scripts/base-set-up-timezone
		/etc/s6-overlay/s6-rc.d/base-set-up-timezone/run
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/etc/s6-overlay/scripts/base-set-up-user
		/etc/s6-overlay/s6-rc.d/base-set-up-user/run