svn commit: r568666 - in head/net/cloud-init: . files

[Brad Davis]

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.