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

sub'>Wojtek'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=948793cb4f83d84f32a871779d057856de87bdb5'>refs</a><a class='active' href='/guix/log/tests/containers.scm'>log</a><a href='/guix/tree/tests/containers.scm?id=948793cb4f83d84f32a871779d057856de87bdb5'>tree</a><a href='/guix/commit/tests/containers.scm?id=948793cb4f83d84f32a871779d057856de87bdb5'>commit</a><a href='/guix/diff/tests/containers.scm?id=948793cb4f83d84f32a871779d057856de87bdb5'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/containers.scm'>
<input type='hidden' name='id' value='948793cb4f83d84f32a871779d057856de87bdb5'/><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=948793cb4f83d84f32a871779d057856de87bdb5'>root</a>/<a href='/guix/log/tests?id=948793cb4f83d84f32a871779d057856de87bdb5'>tests</a>/<a href='/guix/log/tests/containers.scm?id=948793cb4f83d84f32a871779d057856de87bdb5'>containers.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/containers.scm?id=948793cb4f83d84f32a871779d057856de87bdb5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-01-30 22:24:27 +0100'>2023-01-30</span></td><td><a href='/guix/commit/tests/containers.scm?id=0ef8fe22ed8985c9656835fc25ab3463d55b6669'>linux-container: 'container-excursion' forks to join the PID namespace.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/61156&gt;.

* gnu/build/linux-container.scm (container-excursion): Add extra call to
'primitive-fork' and invoke THUNK in the child process.
* tests/containers.scm ("container-excursion"): Remove extra
'primitive-fork' call, now unnecessary.
("container-excursion*, /proc"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-01-30 22:24:27 +0100'>2023-01-30</span></td><td><a href='/guix/commit/tests/containers.scm?id=52eb3db19cb9e5c294c86a8552a4baaa5b473672'>container: Correctly report exit status.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/linux-container.scm (container-excursion): Return the raw
status value.
* tests/containers.scm ("container-excursion, same namespaces"): Add
'status:exit-val' call.
* guix/scripts/container/exec.scm (guix-container-exec): Correctly
handle the different cases.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-10-01 12:51:13 +0200'>2020-10-01</span></td><td><a href='/guix/commit/tests/containers.scm?id=e74818353882f187e5971b5a3a481f17df883dbe'>linux-container: Reset jailed root permissions.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/linux-container.scm (mount-file-systems): Add 'chmod' call.
* tests/containers.scm
("call-with-container, mnt namespace, root permissions"): New test.
</span></span></td><td>Jelle Licht</td></tr>
<tr><td><span title='2019-10-15 10:21:41 +0200'>2019-10-15</span></td><td><a href='/guix/commit/tests/containers.scm?id=e464ac667297d2acf57e52438a39cadc87b95da2'>tests: Skip container test when lacking kernel support.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 96b35998e610c7fc37bf87bf9e07e63d3bebd0a3.

* tests/containers.scm ("eval/container, non-empty load path"): Add
missing 'skip-if-unsupported' call.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-18 23:08:28 +0200'>2019-09-18</span></td><td><a href='/guix/commit/tests/containers.scm?id=96b35998e610c7fc37bf87bf9e07e63d3bebd0a3'>linux-container: 'eval/container' correctly passes -L and -C flags.</a><span class='msg-avail'>...<span class='msg-tooltip'>This fixes a type error.

* gnu/system/linux-container.scm (eval/container): Use 'append-map', not
'map'.
* tests/containers.scm ("eval/container, non-empty load path"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-07-19 11:53:47 +0200'>2019-07-19</span></td><td><a href='/guix/commit/tests/containers.scm?id=bacfec8611530dc3e849fb804b51f50b299796f0'>linux-container: Add 'eval/container'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/linux-container.scm (eval/container): New procedure.
* tests/containers.scm ("eval/container, exit status")
("eval/container, writable user mapping"): New tests.
</span></span></td><td>Ludovic Courtès</td></tr>