Date: Fri, 27 Feb 2026 13:45:35 +0000 From: Kirill Ponomarev <krion@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0f8a5cc13c3d - main - sysutils/cbsd: Update rc script for CIX rebranding Message-ID: <69a19fff.202e0.664bb58e@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f8a5cc13c3d343c1c1abc4f41c2d753b8f726b9 commit 0f8a5cc13c3d343c1c1abc4f41c2d753b8f726b9 Author: Kirill Ponomarev <krion@FreeBSD.org> AuthorDate: 2026-02-27 13:44:58 +0000 Commit: Kirill Ponomarev <krion@FreeBSD.org> CommitDate: 2026-02-27 13:45:31 +0000 sysutils/cbsd: Update rc script for CIX rebranding - Replace hardcoded %%PREFIX%% paths with CIX_DISTDIR and CIX_BIN variables - Rename NO_CBSD_HISTORY to NO_CIX_HISTORY - Use ${miscdir}/daemonize instead of /usr/sbin/daemon --- sysutils/cbsd/Makefile | 1 + sysutils/cbsd/files/cbsdd.in | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index cc6770133084..3e4352f0da2d 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,5 +1,6 @@ PORTNAME= cbsd DISTVERSION= 15.0.4 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= fbsd-ports@convectix.com diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in index f4e7b4c8d00e..16634c8ad791 100644 --- a/sysutils/cbsd/files/cbsdd.in +++ b/sysutils/cbsd/files/cbsdd.in @@ -16,13 +16,16 @@ load_rc_config $name : ${cbsdd_enable="NO"} export workdir="${cbsd_workdir}" -export NO_CBSD_HISTORY=yes +export NO_CIX_HISTORY=yes # disable interactive question export NOINTER=1 # always answer 'no' export ALWAYS_NO=1 -globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"} +[ -z "${CIX_DISTDIR}" ] && CIX_DISTDIR="%%PREFIX%%/cbsd" +[ -z "${CIX_BIN}" ] && CIX_BIN="%%PREFIX%%/bin/cbsd" + +globalconf=${cbsd_globalconf:-"${CIX_DISTDIR}/cbsd.conf"} if [ ! -f ${globalconf} ]; then echo "cbsd: no such ${globalconf}"; @@ -62,22 +65,22 @@ pidfile="${cbsd_workdir}/var/run/$name.pid" command_args="&" cbsdd_prestart() { - %%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1 + ${CIX_BIN} task mode=flushall > /dev/null 2>&1 . ${subrdir}/initenv.subr . ${inventory} - %%PREFIX%%/bin/cbsd sysinv mode=update - %%PREFIX%%/bin/cbsd netinv + ${CIX_BIN} sysinv mode=update + ${CIX_BIN} netinv update_netinfo ${miscdir}/sqlcli ${dbdir}/local.sqlite "UPDATE jails SET status='0' WHERE status='3'" - [ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd naton - /usr/sbin/daemon -f ${rcddir}/jails-astart start + [ -n "${nat_enable}" ] && ${CIX_BIN} naton + ${miscdir}/daemonize ${CIX_BIN} ${rcddir}/jails-astart start } cbsdd_prestop() { - ${rcddir}/jails-astart stop - [ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff + ${CIX_BIN} ${rcddir}/jails-astart stop + [ -n "${nat_enable}" ] && ${CIX_BIN} natoff } cbsdd_stop()home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69a19fff.202e0.664bb58e>