diff --git a/Makefile b/Makefile index 99c4d08e..edd4be61 100644 --- a/Makefile +++ b/Makefile @@ -167,7 +167,7 @@ help: @echo " KRYPTIK_KEYS = $(if $(KRYPTIK_KEYS),$(KRYPTIK_KEYS),(not set - only a development image can be built))" @echo " SUDO = $(if $(SUDO),$(SUDO),(none))" @echo - @echo "Status: pre-alpha. See docs/roadmap.md for what actually works." + @echo "What is tested: docs/status.md. What remains: docs/roadmap.md." paths: @echo "KRYPTIK_ROOT = $(ROOT)" diff --git a/build/recipes/etc.sh b/build/recipes/etc.sh index 1fe98ea6..6ae2ddc8 100644 --- a/build/recipes/etc.sh +++ b/build/recipes/etc.sh @@ -8,7 +8,7 @@ s_etc() { cat > /etc/os-release <<'EOF' NAME="Kryptik" -PRETTY_NAME="Kryptik (pre-alpha)" +PRETTY_NAME="Kryptik" ID=kryptik ANSI_COLOR="0;36" EOF diff --git a/build/recipes/init.sh b/build/recipes/init.sh index 07bf38e1..4d8de9b2 100644 --- a/build/recipes/init.sh +++ b/build/recipes/init.sh @@ -39,19 +39,15 @@ mountpoint -q /dev/shm || mount -t tmpfs tmpfs /dev/shm -o nosuid,nodev mkdir -p /run/kryptik /run/lock chmod 0755 /run/kryptik -# The service manager, IF a compiled database exists. -# -# It deliberately does not exist yet: building an s6-rc source tree and -# compiling it belongs to the compositor and GUI isolation work. Saying so on the console is the point - a -# system that silently boots with no services and no explanation is -# indistinguishable from one whose service manager crashed. +# The service manager. An image without the compiled database says so on the +# console: a boot with no services and no explanation looks like a service +# manager that crashed. if [ -d /usr/lib/kryptik/s6-rc/compiled ]; then s6-rc-init -c /usr/lib/kryptik/s6-rc/compiled /run/service s6-rc -v1 -up change "$rl" else echo "kryptik: no compiled s6-rc database at /usr/lib/kryptik/s6-rc/compiled." echo "kryptik: booting with the early console only; no services will start." - echo "kryptik: this is expected in a pre-alpha image - see docs/roadmap.md, compositor and GUI isolation." fi EOF @@ -63,11 +59,9 @@ EOF exec >/dev/console 2>&1 -# Say so on the console at every step. Three boots could not distinguish -# "shutdownd never spawned this script" from "this script ran and hung", and -# the difference is the whole diagnosis: shutdownd waits for stage 3 to exit -# before it touches the hardware, so anything that blocks here looks exactly -# like a shutdown daemon that ignored the request. +# Say so on the console at every step: shutdownd waits for this script to +# exit before it touches the hardware, so a step that blocks here looks like +# a shutdown daemon that ignored the request. echo "kryptik: rc.shutdown starting" if [ -d /run/service ] && command -v s6-rc >/dev/null 2>&1; then