diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /app-emulation/cloud-init/files | |
parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) |
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'app-emulation/cloud-init/files')
-rw-r--r-- | app-emulation/cloud-init/files/18.5-fix-invalid-string-format.patch | 46 | ||||
-rw-r--r-- | app-emulation/cloud-init/files/cloud-init-18.4-gentoo-support-upstream-templates.patch | 91 |
2 files changed, 0 insertions, 137 deletions
diff --git a/app-emulation/cloud-init/files/18.5-fix-invalid-string-format.patch b/app-emulation/cloud-init/files/18.5-fix-invalid-string-format.patch deleted file mode 100644 index 42030f57dc45..000000000000 --- a/app-emulation/cloud-init/files/18.5-fix-invalid-string-format.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5b065316113b97aadb43e63cc31bb8639f6a6376 Mon Sep 17 00:00:00 2001 -From: Scott Moser <smoser@ubuntu.com> -Date: Fri, 14 Dec 2018 03:24:26 +0000 -Subject: [PATCH] Update to pylint 2.2.2. - -The tip-pylint tox target correctly reported the invalid use of -string formatting. The change here is to: - -a.) Fix the error that was caught. -b.) move to pylint 2.2.2 for the default 'pylint' target. ---- - cloudinit/sources/DataSourceAzure.py | 4 ++-- - tox.ini | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py -index e076d5dc..46efca4a 100644 ---- a/cloudinit/sources/DataSourceAzure.py -+++ b/cloudinit/sources/DataSourceAzure.py -@@ -980,8 +980,8 @@ def read_azure_ovf(contents): - raise NonAzureDataSource("No LinuxProvisioningConfigurationSet") - if len(lpcs_nodes) > 1: - raise BrokenAzureDataSource("found '%d' %ss" % -- ("LinuxProvisioningConfigurationSet", -- len(lpcs_nodes))) -+ (len(lpcs_nodes), -+ "LinuxProvisioningConfigurationSet")) - lpcs = lpcs_nodes[0] - - if not lpcs.hasChildNodes(): -diff --git a/tox.ini b/tox.ini -index 2fb3209d..d983348b 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -21,7 +21,7 @@ setenv = - basepython = python3 - deps = - # requirements -- pylint==1.8.1 -+ pylint==2.2.2 - # test-requirements because unit tests are now present in cloudinit tree - -r{toxinidir}/test-requirements.txt - commands = {envpython} -m pylint {posargs:cloudinit tests tools} --- -2.20.0 - diff --git a/app-emulation/cloud-init/files/cloud-init-18.4-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-18.4-gentoo-support-upstream-templates.patch deleted file mode 100644 index 6f87399af94b..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-18.4-gentoo-support-upstream-templates.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Wed, 24 Oct 2018 10:52:46 +0200 -Subject: [PATCH 2/5] Add support for gentoo in cloud.cfg and templates - ---- - config/cloud.cfg.tmpl | 8 ++++++-- - templates/hosts.gentoo.tmpl | 24 ++++++++++++++++++++++++ - tools/render-cloudcfg | 2 +- - 3 files changed, 31 insertions(+), 3 deletions(-) - create mode 100644 templates/hosts.gentoo.tmpl - -diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl -index 1fef133a..3f5a41a2 100644 ---- a/config/cloud.cfg.tmpl -+++ b/config/cloud.cfg.tmpl -@@ -134,7 +134,7 @@ cloud_final_modules: - # (not accessible to handlers/transforms) - system_info: - # This will affect which distro class gets used --{% if variant in ["centos", "debian", "fedora", "rhel", "suse", "ubuntu", "freebsd"] %} -+{% if variant in ["centos", "debian", "fedora", "rhel", "suse", "ubuntu", "freebsd", "gentoo"] %} - distro: {{ variant }} - {% else %} - # Unknown/fallback distro. -@@ -172,7 +172,7 @@ system_info: - primary: http://ports.ubuntu.com/ubuntu-ports - security: http://ports.ubuntu.com/ubuntu-ports - ssh_svcname: ssh --{% elif variant in ["centos", "rhel", "fedora", "suse"] %} -+{% elif variant in ["centos", "rhel", "fedora", "suse", "gentoo"] %} - # Default user name + that default users groups (if added/used) - default_user: - name: {{ variant }} -@@ -180,6 +180,10 @@ system_info: - gecos: {{ variant }} Cloud User - {% if variant == "suse" %} - groups: [cdrom, users] -+{% elif variant == "gentoo" %} -+ groups: [users, wheel] -+ primary_group: users -+ no_user_group: true - {% else %} - groups: [wheel, adm, systemd-journal] - {% endif %} -diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl -new file mode 100644 -index 00000000..cd045fa6 ---- /dev/null -+++ b/templates/hosts.gentoo.tmpl -@@ -0,0 +1,24 @@ -+## template:jinja -+{# -+This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized -+if enabled in cloud-config. Specifically, in order to enable it -+you need to add the following to config: -+ manage_etc_hosts: True -+-#} -+# Your system has configured 'manage_etc_hosts' as True. -+# As a result, if you wish for changes to this file to persist -+# then you will need to either -+# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl -+# b.) change or remove the value of 'manage_etc_hosts' in -+# /etc/cloud/cloud.cfg or cloud-config from user-data -+# -+# The following lines are desirable for IPv4 capable hosts -+127.0.0.1 {{fqdn}} {{hostname}} -+127.0.0.1 localhost.localdomain localhost -+127.0.0.1 localhost4.localdomain4 localhost4 -+ -+# The following lines are desirable for IPv6 capable hosts -+::1 {{fqdn}} {{hostname}} -+::1 localhost.localdomain localhost -+::1 localhost6.localdomain6 localhost6 -+ -diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg -index 8b7cb875..d109044e 100755 ---- a/tools/render-cloudcfg -+++ b/tools/render-cloudcfg -@@ -4,7 +4,7 @@ import argparse - import os - import sys - --VARIANTS = ["bsd", "centos", "fedora", "rhel", "suse", "ubuntu", "unknown"] -+VARIANTS = ["bsd", "centos", "fedora", "gentoo", "rhel", "suse", "ubuntu", "unknown"] - - if "avoid-pep8-E402-import-not-top-of-file": - _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) --- -2.19.1 - |