From 70415139323e74edd6ccb65af06eabe279e9085c Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Tue, 28 Sep 2021 21:27:18 +0200
Subject: [PATCH] New schemas

---
 .../alpine-standalone/etc_syndicate/getty.pr    |  5 ++++-
 .../alpine-standalone/etc_syndicate/hostname.pr |  3 +++
 .../alpine-standalone/etc_syndicate/network.pr  | 17 ++++++++++-------
 .../alpine-standalone/etc_syndicate/packages.pr |  4 ++--
 .../alpine-standalone/etc_syndicate/sshd.pr     | 15 +++++++++------
 experiments/alpine-standalone/init.sh           |  2 +-
 6 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 experiments/alpine-standalone/etc_syndicate/hostname.pr

diff --git a/experiments/alpine-standalone/etc_syndicate/getty.pr b/experiments/alpine-standalone/etc_syndicate/getty.pr
index 29301fa..e892452 100644
--- a/experiments/alpine-standalone/etc_syndicate/getty.pr
+++ b/experiments/alpine-standalone/etc_syndicate/getty.pr
@@ -1,2 +1,5 @@
 <require-service <daemon getty-console>>
-<daemon getty-console "getty 115200 /dev/ttyAMA0">
+<daemon getty-console {
+  argv: "getty 115200 /dev/ttyAMA0",
+  restart: always,
+}>
diff --git a/experiments/alpine-standalone/etc_syndicate/hostname.pr b/experiments/alpine-standalone/etc_syndicate/hostname.pr
new file mode 100644
index 0000000..5ca5a54
--- /dev/null
+++ b/experiments/alpine-standalone/etc_syndicate/hostname.pr
@@ -0,0 +1,3 @@
+<depends-on <milestone core> <service-state <daemon hostname> complete>>
+<core-service <daemon hostname>>
+<daemon hostname "hostname $(cat /etc/hostname)">
diff --git a/experiments/alpine-standalone/etc_syndicate/network.pr b/experiments/alpine-standalone/etc_syndicate/network.pr
index 6c6464c..492a6a6 100644
--- a/experiments/alpine-standalone/etc_syndicate/network.pr
+++ b/experiments/alpine-standalone/etc_syndicate/network.pr
@@ -1,11 +1,14 @@
-<depends-on <milestone core> <service-running <milestone network>>>
+<depends-on <milestone core> <service-state <milestone network> ready>>
 
-<depends-on <milestone network> <service-running <daemon interfaces>>>
-<service-milestone <daemon interfaces> boot>
+<depends-on <milestone network> <service-state <daemon interfaces> complete>>
+<core-service <daemon interfaces>>
 <daemon interfaces "ifconfig lo 127.0.0.1 up">
 <daemon interfaces "ifconfig eth0 up">
 
-<depends-on <milestone network> <service-running <daemon udhcpc>>>
-<service-milestone <daemon udhcpc> boot>
-<depends-on <daemon udhcpc> <service-running <daemon interfaces>>>
-<daemon udhcpc "udhcpc -i eth0 -fR">
+<depends-on <milestone network> <service-state <daemon udhcpc> ready>>
+<core-service <daemon udhcpc>>
+<depends-on <daemon udhcpc> <service-state <daemon interfaces> complete>>
+<daemon udhcpc {
+  argv: "udhcpc -i eth0 -fR",
+  restart: always,
+}>
diff --git a/experiments/alpine-standalone/etc_syndicate/packages.pr b/experiments/alpine-standalone/etc_syndicate/packages.pr
index d38a68e..8bb718c 100644
--- a/experiments/alpine-standalone/etc_syndicate/packages.pr
+++ b/experiments/alpine-standalone/etc_syndicate/packages.pr
@@ -1,3 +1,3 @@
 <require-service <daemon core-packages>>
-<depends-on <daemon core-packages> <service-running <milestone network>>>
-<daemon core-packages "flock /var/lock/synit/apk apk add $(cat /package-list)">
+<depends-on <daemon core-packages> <service-state <milestone network> ready>>
+<daemon core-packages "flock /var/lock/synit/apk /sbin/apk add $(cat /package-list) >>/var/log/apk.log 2>&1">
diff --git a/experiments/alpine-standalone/etc_syndicate/sshd.pr b/experiments/alpine-standalone/etc_syndicate/sshd.pr
index 741d9e2..240f850 100644
--- a/experiments/alpine-standalone/etc_syndicate/sshd.pr
+++ b/experiments/alpine-standalone/etc_syndicate/sshd.pr
@@ -1,10 +1,13 @@
 <require-service <daemon sshd>>
 
-<depends-on <daemon sshd> <service-running <daemon ssh-host-keys>>>
-<depends-on <daemon sshd> <service-running <daemon <install openssh>>>>
-<daemon sshd "/usr/sbin/sshd -D">
+<depends-on <daemon sshd> <service-state <daemon ssh-host-keys> complete>>
+<depends-on <daemon sshd> <service-state <daemon <install openssh>> complete>>
+<daemon sshd {
+  argv: "/usr/sbin/sshd -D",
+  restart: always,
+}>
 
-<depends-on <daemon ssh-host-keys> <service-running <daemon <install openssh>>>>
-<daemon ssh-host-keys "ssh-keygen -A">
+<depends-on <daemon ssh-host-keys> <service-state <daemon <install openssh>> complete>>
+<daemon ssh-host-keys "ssh-keygen -A >>/var/log/ssh.log 2>&1">
 
-<daemon <install openssh> "flock /var/lock/synit/apk apk add openssh">
+<daemon <install openssh> "flock /var/lock/synit/apk /sbin/apk add openssh >>/var/log/apk.log 2>&1">
diff --git a/experiments/alpine-standalone/init.sh b/experiments/alpine-standalone/init.sh
index e03af3f..6ee8e6e 100644
--- a/experiments/alpine-standalone/init.sh
+++ b/experiments/alpine-standalone/init.sh
@@ -97,4 +97,4 @@ sync
 # # setsid creates a "session", which allows job control to work
 # exec setsid sh -c "exec sh -i <${CONSOLE} >${CONSOLE} 2>&1"
 
-RUST_LOG=trace exec /sbin/synit-pid1
+RUST_LOG=info exec /sbin/synit-pid1