From 7f0ce36828ec1e130bee857b8236ca091e4d8a2c Mon Sep 17 00:00:00 2001
From: Brice Waegeneire <brice@waegenei.re>
Date: Sat, 9 May 2020 15:52:06 +0200
Subject: [PATCH] Add RESTARTCMD for Guix System.

---

openresolv need to know how to restart the nscd service, this patch teach it
to do it on Guix System by using shepherd.

 resolvconf.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/resolvconf.in b/resolvconf.in
index 3cad04d..5ef5294 100644
--- a/resolvconf.in
+++ b/resolvconf.in
@@ -369,6 +369,13 @@ detect_init()
 			then
 				/etc/rc.d/$1 restart
 			fi'
+	elif [ -e /gnu/store ] && [ -e /run/current-system/profile ]; then
+		# Guix System
+		RESTARTCMD='
+			if /run/current-system/profile/bin/herd status $1 2>&1
+			then
+				/run/current-system/profile/bin/herd restart $1
+			fi'
 	else
 		for x in /etc/init.d/rc.d /etc/rc.d /etc/init.d; do
 			[ -d $x ] || continue
-- 
2.26.0

ojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=5f547a5c425cc99553ea713703e09a8db9f3c38b'>refs</a><a class='active' href='/guix/log/tests/texlive.scm'>log</a><a href='/guix/tree/tests/texlive.scm?id=5f547a5c425cc99553ea713703e09a8db9f3c38b'>tree</a><a href='/guix/commit/tests/texlive.scm?id=5f547a5c425cc99553ea713703e09a8db9f3c38b'>commit</a><a href='/guix/diff/tests/texlive.scm?id=5f547a5c425cc99553ea713703e09a8db9f3c38b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/texlive.scm'>
<input type='hidden' name='id' value='5f547a5c425cc99553ea713703e09a8db9f3c38b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=5f547a5c425cc99553ea713703e09a8db9f3c38b'>root</a>/<a href='/guix/log/tests?id=5f547a5c425cc99553ea713703e09a8db9f3c38b'>tests</a>/<a href='/guix/log/tests/texlive.scm?id=5f547a5c425cc99553ea713703e09a8db9f3c38b'>texlive.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/texlive.scm?id=5f547a5c425cc99553ea713703e09a8db9f3c38b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-11-18 13:17:57 +0000'>2021-11-18</span></td><td><a href='/guix/commit/tests/texlive.scm?id=f66da037b457f5d92a0b3e3f53121e17571b42c4'>tests: Replace texlive importer tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/texlive.scm (xml, sxml): Remove variables.
("fetch-sxml: returns SXML for valid XML", "sxml-&gt;package"): Remove tests.
("texlive-&gt;guix-package"): Add new test.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2021-03-06 11:41:48 +0100'>2021-03-06</span></td><td><a href='/guix/commit/tests/texlive.scm?id=c05ceaf2b650d090cf39a048193505cb4e6bd257'>tests: do not hard code HTTP ports</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, test cases could fail if some process was listening
at a hard-coded port.  This patch eliminates most of these potential
failures, by automatically assigning an unbound port.  This should
allow for building multiple guix trees in parallel outside a build
container, though this is currently untested.

The test "home-page: Connection refused" in tests/lint.scm still
hardcodes port 9999, however.

* guix/tests/http.scm
  (http-server-can-listen?): remove now unused procedure.
  (%http-server-port): default to port 0, meaning the OS
  will automatically choose a port.
  (open-http-server-socket): remove the false statement claiming
  this procedure is exported and also return the allocated port
  number.
  (%local-url): raise an error if the port is obviously unbound.
  (call-with-http-server): set %http-server-port to the allocated
  port while the thunk is called.
* tests/derivations.scm: adjust test cases to use automatically
  assign a port.  As there is no risk of a port conflict now,
  do not make any tests conditional upon 'http-server-can-listen?'
  anymore.
* tests/elpa.scm: likewise.
* tests/lint.scm: likewise, and add a TODO comment about a port
  that is still hard-coded.
* tests/texlive.scm: likewise.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Maxime Devos</td></tr>
<tr><td><span title='2020-01-17 14:22:08 +0100'>2020-01-17</span></td><td><a href='/guix/commit/tests/texlive.scm?id=6f918d69b4824226c877c0ca6385360a1dd38bbd'>import: texlive: Avoid uses of '@@' in tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/texlive.scm (fetch-sxml, sxml-&gt;package): Export.
* tests/texlive.scm &lt;top level&gt;: Call '%http-server-port'.
("fetch-sxml: returns SXML for valid XML"): Use 'with-http-server' and
set 'current-http-proxy' instead of using 'mock'.
("sxml-&gt;package"): Remove use of '@@'.
</span></span></td><td>Ludovic Courtès</td></tr>