From 005966750b33176de88fd6a0fd82c637e4257c35 Mon Sep 17 00:00:00 2001
From: Sean Klein <sean@oxide.computer>
Date: Wed, 1 Sep 2021 16:43:14 -0400
Subject: [PATCH 1/4] Workaround for libpq

---
 README.adoc                      | 8 ++++++++
 smf/bootstrap-agent/manifest.xml | 2 +-
 smf/nexus/manifest.xml           | 2 +-
 smf/oximeter/manifest.xml        | 2 +-
 smf/propolis-server/manifest.xml | 2 +-
 smf/sled-agent/manifest.xml      | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/README.adoc b/README.adoc
index 7d988f9107..335450d922 100644
--- a/README.adoc
+++ b/README.adoc
@@ -56,6 +56,14 @@ However, once these have been provided, the codebase should be buildable with `c
 
 **Prerequisites:**
 
+. Postgres
+
+(See https://github.com/oxidecomputer/omicron/issues/213 ; we may be able to remove this dependency long-term)
+
+Linux: `sudo apt-get install libpq-dev`
+Mac: `brew install postgresql`
+Helios: `pkg install library/postgresql-13`
+
 . CockroachDB v20.2.5.
 +
 The test suite expects to be able to start a single-node CockroachDB cluster using the `cockroach` executable on your PATH.
diff --git a/smf/bootstrap-agent/manifest.xml b/smf/bootstrap-agent/manifest.xml
index d7da9b7fd2..8fac04129f 100644
--- a/smf/bootstrap-agent/manifest.xml
+++ b/smf/bootstrap-agent/manifest.xml
@@ -30,7 +30,7 @@
   </dependency>
 
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent /opt/oxide/bootstrap-agent/bootstrap-agent run %{config/server_id} %{config/server_addr} &amp;'
+    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/bootstrap-agent/bootstrap-agent run %{config/server_id} %{config/server_addr} &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 
diff --git a/smf/nexus/manifest.xml b/smf/nexus/manifest.xml
index 5021d79f34..1f8d113a9d 100644
--- a/smf/nexus/manifest.xml
+++ b/smf/nexus/manifest.xml
@@ -13,7 +13,7 @@
   </dependency>
 
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent /opt/oxide/nexus/nexus /opt/oxide/nexus/pkg/config.toml &amp;'
+    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/nexus/nexus /opt/oxide/nexus/pkg/config.toml &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 
diff --git a/smf/oximeter/manifest.xml b/smf/oximeter/manifest.xml
index a588bd8446..23b7cb743a 100644
--- a/smf/oximeter/manifest.xml
+++ b/smf/oximeter/manifest.xml
@@ -13,7 +13,7 @@
   </dependency>
 
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent /opt/oxide/oximeter/oximeter ./config.toml &amp;'
+    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/oximeter/oximeter ./config.toml &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 
diff --git a/smf/propolis-server/manifest.xml b/smf/propolis-server/manifest.xml
index 8ec7c82757..f24eaa6620 100644
--- a/smf/propolis-server/manifest.xml
+++ b/smf/propolis-server/manifest.xml
@@ -10,7 +10,7 @@
   </dependency>
 
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent /opt/oxide/propolis-server/propolis-server /opt/oxide/propolis-server/pkg/config.toml %{config/server_addr} &amp;'
+    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/propolis-server/propolis-server run /opt/oxide/propolis-server/pkg/config.toml %{config/server_addr} &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 
diff --git a/smf/sled-agent/manifest.xml b/smf/sled-agent/manifest.xml
index 51376acb8a..2be3f13b02 100644
--- a/smf/sled-agent/manifest.xml
+++ b/smf/sled-agent/manifest.xml
@@ -13,7 +13,7 @@
   </dependency>
 
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent /opt/oxide/sled-agent/sled-agent run %{svc:/system/illumos/bootstrap-agent:default/:properties/config/server_id} %{config/server_addr} %{config/nexus_addr} &amp;'
+    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/sled-agent/sled-agent run %{svc:/system/illumos/bootstrap-agent:default/:properties/config/server_id} %{config/server_addr} %{config/nexus_addr} &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 

From bc54efbe6f540662537688dd5ed612e2e78ee05c Mon Sep 17 00:00:00 2001
From: Sean Klein <sean@oxide.computer>
Date: Wed, 1 Sep 2021 16:46:37 -0400
Subject: [PATCH 2/4] Update readme

---
 README.adoc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.adoc b/README.adoc
index 335450d922..2a5d5d606a 100644
--- a/README.adoc
+++ b/README.adoc
@@ -58,12 +58,21 @@ However, once these have been provided, the codebase should be buildable with `c
 
 . Postgres
 
+Postgres is required to link against libpq for access to the database.
+
 (See https://github.com/oxidecomputer/omicron/issues/213 ; we may be able to remove this dependency long-term)
 
 Linux: `sudo apt-get install libpq-dev`
 Mac: `brew install postgresql`
 Helios: `pkg install library/postgresql-13`
 
+Additionally, to help all cargo build commands find this library, we recommend the following:
+
+[source,text]
+----
+export LD_LIBRARY_PATH="$(pg_config --libdir)"
+----
+
 . CockroachDB v20.2.5.
 +
 The test suite expects to be able to start a single-node CockroachDB cluster using the `cockroach` executable on your PATH.

From 7c5c848f21b6a3691edd51de6540e35415d3cd62 Mon Sep 17 00:00:00 2001
From: Sean Klein <sean@oxide.computer>
Date: Wed, 1 Sep 2021 17:10:18 -0400
Subject: [PATCH 3/4] Review feedback

---
 README.adoc                      | 3 +--
 smf/propolis-server/manifest.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.adoc b/README.adoc
index 2a5d5d606a..1eb2f03915 100644
--- a/README.adoc
+++ b/README.adoc
@@ -66,8 +66,7 @@ Linux: `sudo apt-get install libpq-dev`
 Mac: `brew install postgresql`
 Helios: `pkg install library/postgresql-13`
 
-Additionally, to help all cargo build commands find this library, we recommend the following:
-
+Additionally, to help all runtime commands find this library, we recommend the following:
 [source,text]
 ----
 export LD_LIBRARY_PATH="$(pg_config --libdir)"
diff --git a/smf/propolis-server/manifest.xml b/smf/propolis-server/manifest.xml
index f24eaa6620..592cbeab15 100644
--- a/smf/propolis-server/manifest.xml
+++ b/smf/propolis-server/manifest.xml
@@ -10,7 +10,7 @@
   </dependency>
 
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/propolis-server/propolis-server run /opt/oxide/propolis-server/pkg/config.toml %{config/server_addr} &amp;'
+    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/propolis-server/propolis-server /opt/oxide/propolis-server/pkg/config.toml %{config/server_addr} &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 

From d881b90368d5a27a062bde658a3c49d7e6b1fc76 Mon Sep 17 00:00:00 2001
From: Sean Klein <sean@oxide.computer>
Date: Wed, 1 Sep 2021 17:27:00 -0400
Subject: [PATCH 4/4] rm feedback

---
 smf/bootstrap-agent/manifest.xml | 7 ++++++-
 smf/nexus/manifest.xml           | 7 ++++++-
 smf/oximeter/manifest.xml        | 7 ++++++-
 smf/propolis-server/manifest.xml | 7 ++++++-
 smf/sled-agent/manifest.xml      | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/smf/bootstrap-agent/manifest.xml b/smf/bootstrap-agent/manifest.xml
index 8fac04129f..97d4a75ce1 100644
--- a/smf/bootstrap-agent/manifest.xml
+++ b/smf/bootstrap-agent/manifest.xml
@@ -29,8 +29,13 @@
     <service_fmri value='svc:/milestone/devices' />
   </dependency>
 
+  <method_context>
+    <method_environment>
+      <envvar name="LD_LIBRARY_PATH" value="/opt/ooce/pgsql-13/lib/amd64" />
+    </method_environment>
+  </method_context>
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/bootstrap-agent/bootstrap-agent run %{config/server_id} %{config/server_addr} &amp;'
+    exec='ctrun -l child -o noorphan,regent /opt/oxide/bootstrap-agent/bootstrap-agent run %{config/server_id} %{config/server_addr} &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 
diff --git a/smf/nexus/manifest.xml b/smf/nexus/manifest.xml
index 1f8d113a9d..2f3905dc77 100644
--- a/smf/nexus/manifest.xml
+++ b/smf/nexus/manifest.xml
@@ -12,8 +12,13 @@
   <service_fmri value='svc:/system/illumos/bootstrap-agent' />
   </dependency>
 
+  <method_context>
+    <method_environment>
+      <envvar name="LD_LIBRARY_PATH" value="/opt/ooce/pgsql-13/lib/amd64" />
+    </method_environment>
+  </method_context>
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/nexus/nexus /opt/oxide/nexus/pkg/config.toml &amp;'
+    exec='ctrun -l child -o noorphan,regent /opt/oxide/nexus/nexus /opt/oxide/nexus/pkg/config.toml &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 
diff --git a/smf/oximeter/manifest.xml b/smf/oximeter/manifest.xml
index 23b7cb743a..9801c467ed 100644
--- a/smf/oximeter/manifest.xml
+++ b/smf/oximeter/manifest.xml
@@ -12,8 +12,13 @@
   <service_fmri value='svc:/system/illumos/bootstrap-agent' />
   </dependency>
 
+  <method_context>
+    <method_environment>
+      <envvar name="LD_LIBRARY_PATH" value="/opt/ooce/pgsql-13/lib/amd64" />
+    </method_environment>
+  </method_context>
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/oximeter/oximeter ./config.toml &amp;'
+    exec='ctrun -l child -o noorphan,regent /opt/oxide/oximeter/oximeter ./config.toml &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 
diff --git a/smf/propolis-server/manifest.xml b/smf/propolis-server/manifest.xml
index 592cbeab15..f838f4b89e 100644
--- a/smf/propolis-server/manifest.xml
+++ b/smf/propolis-server/manifest.xml
@@ -9,8 +9,13 @@
   <service_fmri value='svc:/milestone/network:default' />
   </dependency>
 
+  <method_context>
+    <method_environment>
+      <envvar name="LD_LIBRARY_PATH" value="/opt/ooce/pgsql-13/lib/amd64" />
+    </method_environment>
+  </method_context>
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/propolis-server/propolis-server /opt/oxide/propolis-server/pkg/config.toml %{config/server_addr} &amp;'
+    exec='ctrun -l child -o noorphan,regent /opt/oxide/propolis-server/propolis-server /opt/oxide/propolis-server/pkg/config.toml %{config/server_addr} &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />
 
diff --git a/smf/sled-agent/manifest.xml b/smf/sled-agent/manifest.xml
index 2be3f13b02..d3063a8e2d 100644
--- a/smf/sled-agent/manifest.xml
+++ b/smf/sled-agent/manifest.xml
@@ -12,8 +12,13 @@
   <service_fmri value='svc:/system/illumos/bootstrap-agent' />
   </dependency>
 
+  <method_context>
+    <method_environment>
+      <envvar name="LD_LIBRARY_PATH" value="/opt/ooce/pgsql-13/lib/amd64" />
+    </method_environment>
+  </method_context>
   <exec_method type='method' name='start'
-    exec='ctrun -l child -o noorphan,regent env "LD_LIBRARY_PATH=/opt/ooce/pgsql-13/lib/amd64" /opt/oxide/sled-agent/sled-agent run %{svc:/system/illumos/bootstrap-agent:default/:properties/config/server_id} %{config/server_addr} %{config/nexus_addr} &amp;'
+    exec='ctrun -l child -o noorphan,regent /opt/oxide/sled-agent/sled-agent run %{svc:/system/illumos/bootstrap-agent:default/:properties/config/server_id} %{config/server_addr} %{config/nexus_addr} &amp;'
     timeout_seconds='0' />
   <exec_method type='method' name='stop' exec=':kill' timeout_seconds='0' />