Date: Fri, 10 Sep 2021 06:58:47 GMT From: Kirill Ponomarev <krion@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 192c093df768 - 2021Q3 - sysutils/cbsd: fix init vmpackages table Message-ID: <202109100658.18A6wlIo051356@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=192c093df768956d485f471c8b17d372f9d9a010 commit 192c093df768956d485f471c8b17d372f9d9a010 Author: Kirill Ponomarev <krion@FreeBSD.org> AuthorDate: 2021-09-10 06:57:38 +0000 Commit: Kirill Ponomarev <krion@FreeBSD.org> CommitDate: 2021-09-10 06:58:44 +0000 sysutils/cbsd: fix init vmpackages table (cherry picked from commit 38cfe76e2c8ed376d88b8f8e5d130a80a0d48369) --- sysutils/cbsd/Makefile | 1 + sysutils/cbsd/files/patch-sudoexec_initenv | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 5d3c69a5cd85..e86df2c437da 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,5 +1,6 @@ PORTNAME= cbsd DISTVERSION= 13.0.14 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru diff --git a/sysutils/cbsd/files/patch-sudoexec_initenv b/sysutils/cbsd/files/patch-sudoexec_initenv new file mode 100644 index 000000000000..2d7d12b09058 --- /dev/null +++ b/sysutils/cbsd/files/patch-sudoexec_initenv @@ -0,0 +1,13 @@ +--- sudoexec/initenv.orig 2021-09-05 15:55:48 UTC ++++ sudoexec/initenv +@@ -683,6 +683,10 @@ phase5() + env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-xen.schema xen + env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-vnetnic.schema vnetnic + env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-vmpackages.schema vmpackages ++ _tmpval=$( ${miscdir}/sqlcli ${dbdir}/local.sqlite "SELECT name FROM vmpackages WHERE name=\"small1\" LIMIT 1" ) ++ if [ -z "${_tmpval}" ]; then ++ ${miscdir}/sqlcli ${dbdir}/local.sqlite "INSERT INTO vmpackages ( name, pkg_vm_cpus, pkg_vm_ram, pkg_vm_disk, owner ) VALUES ( 'small1', '1', '1g', '10g', 'admin' )" ++ fi + env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-vm_cpu_topology.schema vm_cpu_topology + env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/cbsdtaskd.sqlite ${distdir}/share/cbsdtaskd-taskd.schema taskd + env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/vpnet.sqlite ${distdir}/share/vpnet-vpnet.schema vpnet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109100658.18A6wlIo051356>