From ce9836117896770f11ae6e10995f51394699f660 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Fri, 24 May 2024 15:17:47 +0200
Subject: [PATCH] Pattern extensibility causes trouble: avoid it here

---
 .../synit-config/files/etc/syndicate/boot/010-exec.pr       | 6 +++---
 .../synit-config/files/etc/syndicate/services/modem.pr      | 2 +-
 .../synit-config/files/etc/syndicate/services/network.pr    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packaging/packages/synit-config/files/etc/syndicate/boot/010-exec.pr b/packaging/packages/synit-config/files/etc/syndicate/boot/010-exec.pr
index c1a1735..b1c0bf8 100644
--- a/packaging/packages/synit-config/files/etc/syndicate/boot/010-exec.pr
+++ b/packaging/packages/synit-config/files/etc/syndicate/boot/010-exec.pr
@@ -1,6 +1,6 @@
-# Sending <exec SOMECOMMAND RESTARTPOLICY> causes the command to be run.
+# Sending <exec/restart SOMECOMMAND RESTARTPOLICY> causes the command to be run.
 #
-?? <exec ?argv ?restartPolicy> [
+?? <exec/restart ?argv ?restartPolicy> [
   let ?id = timestamp
   let ?facet = facet
   let ?d = <temporary-exec $id $argv>
@@ -16,4 +16,4 @@
 
 # If the restart policy is not specified, it is defaulted to `on-error`.
 #
-?? <exec ?argv> ! <exec $argv on-error>
+?? <exec ?argv> ! <exec/restart $argv on-error>
diff --git a/packaging/packages/synit-config/files/etc/syndicate/services/modem.pr b/packaging/packages/synit-config/files/etc/syndicate/services/modem.pr
index 8699e49..91fb546 100644
--- a/packaging/packages/synit-config/files/etc/syndicate/services/modem.pr
+++ b/packaging/packages/synit-config/files/etc/syndicate/services/modem.pr
@@ -40,6 +40,6 @@
     # So instead we kill the qmicli program with a signal, which *does* trigger the supervisor
     # in the right way.
     let ?pid = stringify $pid
-    $config ! <exec ["kill", "-INT", $pid] never>
+    $config ! <exec/restart ["kill", "-INT", $pid] never>
   ]
 ]
diff --git a/packaging/packages/synit-config/files/etc/syndicate/services/network.pr b/packaging/packages/synit-config/files/etc/syndicate/services/network.pr
index 0f5e8d8..3109fd6 100644
--- a/packaging/packages/synit-config/files/etc/syndicate/services/network.pr
+++ b/packaging/packages/synit-config/files/etc/syndicate/services/network.pr
@@ -7,7 +7,7 @@
 
 ? <configure-interface ?ifname <static ?ipaddr>> [
   ! <exec ["ip" "address" "add" "dev" $ifname $ipaddr]>
-  ?- ! <exec ["ip" "address" "del" "dev" $ifname $ipaddr] never>
+  ?- ! <exec/restart ["ip" "address" "del" "dev" $ifname $ipaddr] never>
 ]
 
 ? <configure-interface ?ifname <dhcp>> [
@@ -35,7 +35,7 @@
     $log ! <log "-" { saw-machine-interface: $ifname }>
     $config [
       ! <exec ["ip" "link" "set" $ifname "up"]>
-      ?- ! <exec ["ip" "link" "set" $ifname "down"] never>
+      ?- ! <exec/restart ["ip" "link" "set" $ifname "down"] never>
     ]
   ]