net-p2p/cardano-node: Fix rc script.

Fixes: 3f205a5
freebsd · Feb 27, 2023 · 8b9129a · 8b9129a
1 parent 478934d
commit 8b9129a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/net-p2p/cardano-node/Makefile b/net-p2p/cardano-node/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cardano-node
 PORTVERSION=	1.35.5
-PORTREVISION=	1
+PORTREVISION=	2
 MASTER_SITES=	https://input-output-hk.github.io/cardano-haskell-packages/package/:chap
 CATEGORIES=	net-p2p
 

diff --git a/net-p2p/cardano-node/files/cardano_node.in b/net-p2p/cardano-node/files/cardano_node.in
@@ -131,6 +131,11 @@ eval "_host=\${${name}_host}"
 eval "_port=\${${name}_port}"
 eval "_flags=\${${name}_flags}"
 
+jail_topology="/topology_dir/`basename ${_topology}`"
+jail_config="/config_dir/`basename ${_config}`"
+jail_socket="/socket/`basename ${_socket}`"
+jail_args="name=${name}_jail exec.jail_user=cardano exec.system_jail_user host=inherit"
+
 jail_root="${_home}/jail"
 jail_copy_resolv_conf=yes
 jail_copy_services=yes
@@ -139,16 +144,11 @@ jail_mount_devfs=yes
 jail_ip_inherit=yes
 #TODO: daemon fails with "Network.Socket.bind: permission denied" without suid ;\
 jail_prepare_inside_cmds="mkdir ./socket ;\
-                          ln -s ./${jail_socket} ${_socket} ;\
+                          ln -s ./jail/${jail_socket} ${_socket} ;\
                           chmod +s ./bin/cardano-node"
 jail_nullfs_mounts="${_db} ${jail_root}/db rw \
                     ${_home}/logs ${jail_root}/logs rw"
 
-jail_topology="/topology_dir/`basename ${_topology}`"
-jail_config="/config_dir/`basename ${_config}`"
-jail_socket="/socket/`basename ${_socket}`"
-jail_args="name=${name}_jail exec.jail_user=cardano exec.system_jail_user host=inherit"
-
 pidfile="/var/run/${name}.pid"
 flags="run +RTS ${_rts_flags} -RTS \
         --database-path /db \