Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
2 changes: 1 addition & 1 deletion build/recipes/etc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 6 additions & 12 deletions build/recipes/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
Loading