From owner-svn-ports-head@freebsd.org Wed Mar 17 15:28:54 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8B04A56C87A; Wed, 17 Mar 2021 15:28:54 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0vFf3YxVz4XJV; Wed, 17 Mar 2021 15:28:54 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D2C611249; Wed, 17 Mar 2021 15:28:54 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12HFSsaT035321; Wed, 17 Mar 2021 15:28:54 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12HFSsDk035320; Wed, 17 Mar 2021 15:28:54 GMT (envelope-from brd@FreeBSD.org) Message-Id: <202103171528.12HFSsDk035320@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Wed, 17 Mar 2021 15:28:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568666 - in head/net/cloud-init: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head/net/cloud-init: . files X-SVN-Commit-Revision: 568666 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 15:28:54 -0000 Author: brd (src,doc committer) Date: Wed Mar 17 15:28:53 2021 New Revision: 568666 URL: https://svnweb.freebsd.org/changeset/ports/568666 Log: net/cloud-init: Fix modifying rc.conf in cc_salt_minion PR: 254339 Approved by: Andrey Fesenko (maintainer), swills Added: head/net/cloud-init/files/ head/net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py (contents, props changed) Modified: head/net/cloud-init/Makefile Modified: head/net/cloud-init/Makefile ============================================================================== --- head/net/cloud-init/Makefile Wed Mar 17 14:59:14 2021 (r568665) +++ head/net/cloud-init/Makefile Wed Mar 17 15:28:53 2021 (r568666) @@ -2,6 +2,7 @@ PORTNAME= cloud-init DISTVERSION= 20.4.1 +PORTREVISION= 1 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Added: head/net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py Wed Mar 17 15:28:53 2021 (r568666) @@ -0,0 +1,21 @@ +--- cloudinit/config/cc_salt_minion.py.orig 2021-01-15 17:33:05 UTC ++++ cloudinit/config/cc_salt_minion.py +@@ -46,7 +46,7 @@ specify them with ``pkg_name``, ``service_name`` and ` + import os + + from cloudinit import safeyaml, subp, util +-from cloudinit.distros import rhel_util ++from cloudinit.distros import bsd_utils + + + # Note: see https://docs.saltstack.com/en/latest/topics/installation/ +@@ -125,8 +141,7 @@ def handle(name, cfg, cloud, log, _args): + # we need to have the salt minion service enabled in rc in order to be + # able to start the service. this does only apply on FreeBSD servers. + if cloud.distro.osfamily == 'freebsd': +- rhel_util.update_sysconfig_file( +- '/etc/rc.conf', {'salt_minion_enable': 'YES'}) ++ bsd_utils.set_rc_config_value('salt_minion_enable', 'YES') + + # restart salt-minion. 'service' will start even if not started. if it + # was started, it needs to be restarted for config change.