Attachment 223327 Details for Bug 254339 – patch

[patch] patch

cloud-init.diff (text/plain), 1.97 KB, created by Brad Davis on 2021-03-16 17:01:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Davis

Created: 2021-03-16 17:01:57 UTC

Size: 1.97 KB

patch

obsolete

>Index: net/cloud-init/Makefile
>===================================================================
>--- net/cloud-init/Makefile	(revision 568566)
>+++ net/cloud-init/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	cloud-init
> DISTVERSION=	20.4.1
>+PORTREVISION=   1
> CATEGORIES=	net python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>Index: net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py
>===================================================================
>--- net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py	(nonexistent)
>+++ net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py	(working copy)
>@@ -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.
>
>Property changes on: net/cloud-init/files/patch-cloudinit_config_cc__salt__minion.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 254339: 223327