From b3f2504c1d05b5999b74b2135860fc721e3adf68 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Jul 2022 07:41:50 +0100 Subject: gentoo auto-resync : 15:07:2022 - 07:41:50 --- app-emulation/Manifest.gz | Bin 14820 -> 14820 bytes app-emulation/cloud-init/Manifest | 8 -- .../18.4-add-support-for-package_upgrade.patch | 54 ----------- .../18.4-fix-filename-for-storing-locale.patch | 30 ------ .../18.4-fix-update_package_sources-function.patch | 26 ------ .../22.1-add-support-for-package_upgrade.patch | 48 ---------- .../22.1-fix-update_package_sources-function.patch | 21 ----- .../cloud-init-18.4-fix-packages-module.patch | 25 ----- ...it-20.4-gentoo-support-upstream-templates.patch | 86 ------------------ ...it-21.2-gentoo-support-upstream-templates.patch | 101 --------------------- 10 files changed, 399 deletions(-) delete mode 100644 app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch delete mode 100644 app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch delete mode 100644 app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch delete mode 100644 app-emulation/cloud-init/files/22.1-add-support-for-package_upgrade.patch delete mode 100644 app-emulation/cloud-init/files/22.1-fix-update_package_sources-function.patch delete mode 100644 app-emulation/cloud-init/files/cloud-init-18.4-fix-packages-module.patch delete mode 100644 app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch delete mode 100644 app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index bddd9bb9169b..2160dff4227f 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest index c1424523de45..7e2f0fddd1c5 100644 --- a/app-emulation/cloud-init/Manifest +++ b/app-emulation/cloud-init/Manifest @@ -1,11 +1,3 @@ -AUX 18.4-add-support-for-package_upgrade.patch 1734 BLAKE2B 1eb4fd07bec989b1584ec0ad272243d33f0c6b6fd17994b6bda69c38a0360acedfdeb7ca81f8c9bee2c35a40b07b5f831a10315129c1b0fd030a00881831fc76 SHA512 ebe2eadb13190d29e1933a81d1e8a0301842f2a9fbf1848ec2618c479a731d98d8807827abb1b43aebb05110bc566048841f8d1b63118b691f8a0c3e4c32aefb -AUX 18.4-fix-filename-for-storing-locale.patch 1045 BLAKE2B 0167101d78f821fefc3d05447d3fe35d7328cdebcb3a0eebdaaf2f14b8e2f46efe7c0fb4031baa3a8600546a47f98641719112992c8e50cc1ab0181851937f81 SHA512 8a3b1bf35a445cbc7c3d4849c4c9ebd716209bc3b38bc060cd3b27b1b09749da8dcf35c8e0963300f7cc21f43fda96e5928f9f3c86c22a784cc60b840a1cc419 -AUX 18.4-fix-update_package_sources-function.patch 880 BLAKE2B f8a50714d5763f43c177de8e65369203e4d3b94de98126b85fca22ee4a89f9568c6081078b03dd4bb6cdcd07c51bc55b093e94092a06fd7eeec610ce22780f67 SHA512 8b82d0e565a9f8b4f6464382e01b79c95ad0ced600bf2ba1c6377eea704f86108cf68bc20c99f65e68c6b2d7a7ccc02624bfef400dd76990ef18f00f1e220f6c -AUX 22.1-add-support-for-package_upgrade.patch 1614 BLAKE2B 77f1c96a2a403fa0fedd2d80809bab03aa617b82bf590c4b274bb618b84a801b76734d500010e8749021d7e78bcb2a0b419773dffff25c728f82448645f458ef SHA512 308a5943da076b23aee25ba2a6c2302600476572903acd9d3f8806e7f7c3ed6d6ee39b268bb5d1a7702289aa86e9f5ffbf24823754a93aa84e889ec459353072 -AUX 22.1-fix-update_package_sources-function.patch 714 BLAKE2B 361ce316d4c499da40e55651fc3b0d4279b78386a47bf17240a1ca2071893f6454f9658c5242c19a05f3788680ed430a8b2308d03931ba6c0c5c282cd28a6da9 SHA512 2f8509356c66b5fd915280b21720e4072119d7fe85b747929cafb0c72926fb9ed1c300cd82f7e07696bd051720e3b53153299b07e51391821aafc30f6e28a6f7 -AUX cloud-init-18.4-fix-packages-module.patch 704 BLAKE2B e5deb163e7d97365befb63bf6978900d250356a3b29972b5c8ec6dd19c202d03cf0a07bbf1e8b437c3ec80b810f5c1af456bd589adfde290636b3fc10028ad36 SHA512 ea28c8d5c9a4ebd0d65dea8dd09e5c9c9973fc3456ff8a4e35b3eb4eb856e5c4809b922ef5d958682fb7429ba23eafd80e0fdee629967b7f838d4127db5e1ac7 -AUX cloud-init-20.4-gentoo-support-upstream-templates.patch 3467 BLAKE2B 0d6185373ef7de03de60f3ae277a808a8457c8bbce23ab5a10ff3382c0ace244fe5d054285d2eeeb99956863156f3ff0000b7f6f84b706489d19c29cb1dbeadf SHA512 d5209c78ede276b6d614baad2ff586008694e4533114394207f377a67cbb8cd9a73547c8e0a9daa55051fa56ccb099b3a0f2bcf824cda0cbef0de858332c95f8 -AUX cloud-init-21.2-gentoo-support-upstream-templates.patch 3793 BLAKE2B 4e5cbc9fa872cc1d148861be1d1fb0615a68e69c6acbec8173580590c8d2c5e50df44e067d3b8ea77dd0b23ef658837a2a317c98712f8b42e9a14398d4cfe996 SHA512 9d436f223dacfd018df4caf407b0da3de5e9cc1932d3aad56f455c664d2b9f3dc8ab40d8607f9ef4481ee778ae897717161d3cb1a7d4d99041585a00a97d8774 DIST cloud-init-22.2.2.tar.gz 1349451 BLAKE2B fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae SHA512 18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf EBUILD cloud-init-22.2.2.ebuild 2303 BLAKE2B dd14192049501a05542cd32c78833b0757e9c250a527081b6923743fda766873eda41a7e97aaf407921d7081b1499b67e528b5e5fd70f08b3523568480969132 SHA512 e90ee7bdf5df9a42deecfa6e5f004cc4752437e6807cf4ebb87be72a32b489f5d26a58612f6168653e0619ae6d463a3a36723371761a7cca7a54b50e87238c12 EBUILD cloud-init-9999.ebuild 2262 BLAKE2B d9e5722888f36579fed20e1adcb91e36a465395a19f5cf958cd85f8c25c229ee33515bc0a2d98f85f1f470b3bad53c20e7906551778237dfeaea97b062e3c282 SHA512 12ffc5dbdffce1927ff142e7e0a5be049543661b7aeb6643b3b6c7b65c462acc7969f31bcc120d2975e0b39624e89952adc17d2fc89f55878a2fb1350376985a diff --git a/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch b/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch deleted file mode 100644 index 9c542cfc0777..000000000000 --- a/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7868b97507d0dd7d7721ad5c4539e22c67635f92 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 14 Nov 2018 15:58:30 +0100 -Subject: [PATCH 5/5] gentoo: add support for package_upgrade - ---- - cloudinit/distros/gentoo.py | 25 ++++++++++++++----------- - 1 file changed, 14 insertions(+), 11 deletions(-) - -diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py -index 7b838e82..22ad2cf3 100644 ---- a/cloudinit/distros/gentoo.py -+++ b/cloudinit/distros/gentoo.py -@@ -189,23 +189,26 @@ class Distro(distros.Distro): - distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz)) - - def package_command(self, command, args=None, pkgs=None): -- if pkgs is None: -- pkgs = [] -- - cmd = ['emerge'] - # Redirect output - cmd.append("--quiet") - -- if args and isinstance(args, str): -- cmd.append(args) -- elif args and isinstance(args, list): -- cmd.extend(args) -+ if command == "upgrade": -+ cmd.extend(["--update", "world"]) -+ else: -+ if pkgs is None: -+ pkgs = [] -+ -+ if args and isinstance(args, str): -+ cmd.append(args) -+ elif args and isinstance(args, list): -+ cmd.extend(args) - -- if command: -- cmd.append(command) -+ if command: -+ cmd.append(command) - -- pkglist = util.expand_package_list('%s-%s', pkgs) -- cmd.extend(pkglist) -+ pkglist = util.expand_package_list('%s-%s', pkgs) -+ cmd.extend(pkglist) - - # Allow the output of this to flow outwards (ie not be captured) - util.subp(cmd, capture=False) --- -2.19.1 - diff --git a/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch b/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch deleted file mode 100644 index a5bbf6034ac5..000000000000 --- a/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3756cdea3e844b9611de321a8075df80e7dbf74d Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 14 Nov 2018 15:28:22 +0100 -Subject: [PATCH 3/5] gentoo: fix filename for storing locale - -There must have been a misunderstanding as locale.gen is meant to -contain locales to be generated if no argument is passed to locale-gen. - -When using openrc, Gentoo stores system locale in /etc/env.d/02locale -which is generally manipulated through eselect. ---- - cloudinit/distros/gentoo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py -index 98ac41ca..50bb61fb 100644 ---- a/cloudinit/distros/gentoo.py -+++ b/cloudinit/distros/gentoo.py -@@ -20,7 +20,7 @@ LOG = logging.getLogger(__name__) - - - class Distro(distros.Distro): -- locale_conf_fn = '/etc/locale.gen' -+ locale_conf_fn = '/etc/env.d/02locale' - network_conf_fn = '/etc/conf.d/net' - resolve_conf_fn = '/etc/resolv.conf' - hostname_conf_fn = '/etc/conf.d/hostname' --- -2.19.1 - diff --git a/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch b/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch deleted file mode 100644 index d90258d1bc48..000000000000 --- a/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b15c4c4b24c894b3c8d444466110c881c35525e2 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 14 Nov 2018 15:35:37 +0100 -Subject: [PATCH 4/5] gentoo: fix update_package_sources function - -Method is meant to update packages repository, not to update the system. ---- - cloudinit/distros/gentoo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py -index 50bb61fb..7b838e82 100644 ---- a/cloudinit/distros/gentoo.py -+++ b/cloudinit/distros/gentoo.py -@@ -212,7 +212,7 @@ class Distro(distros.Distro): - - def update_package_sources(self): - self._runner.run("update-sources", self.package_command, -- ["-u", "world"], freq=PER_INSTANCE) -+ ["--sync"], freq=PER_INSTANCE) - - - def convert_resolv_conf(settings): --- -2.19.1 - diff --git a/app-emulation/cloud-init/files/22.1-add-support-for-package_upgrade.patch b/app-emulation/cloud-init/files/22.1-add-support-for-package_upgrade.patch deleted file mode 100644 index 124b4225d830..000000000000 --- a/app-emulation/cloud-init/files/22.1-add-support-for-package_upgrade.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7868b97507d0dd7d7721ad5c4539e22c67635f92 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 14 Nov 2018 15:58:30 +0100 -Subject: [PATCH 5/5] gentoo: add support for package_upgrade - ---- -diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py -index 4eb76da8..702cda8a 100644 ---- a/cloudinit/distros/gentoo.py -+++ b/cloudinit/distros/gentoo.py -@@ -218,23 +218,26 @@ class Distro(distros.Distro): - distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz)) - - def package_command(self, command, args=None, pkgs=None): -- if pkgs is None: -- pkgs = [] -- - cmd = list("emerge") - # Redirect output - cmd.append("--quiet") - -- if args and isinstance(args, str): -- cmd.append(args) -- elif args and isinstance(args, list): -- cmd.extend(args) -+ if command == "upgrade": -+ cmd.extend(["--update", "world"]) -+ else: -+ if pkgs is None: -+ pkgs = [] -+ -+ if args and isinstance(args, str): -+ cmd.append(args) -+ elif args and isinstance(args, list): -+ cmd.extend(args) - -- if command: -- cmd.append(command) -+ if command: -+ cmd.append(command) - -- pkglist = util.expand_package_list("%s-%s", pkgs) -- cmd.extend(pkglist) -+ pkglist = util.expand_package_list("%s-%s", pkgs) -+ cmd.extend(pkglist) - - # Allow the output of this to flow outwards (ie not be captured) - subp.subp(cmd, capture=False) diff --git a/app-emulation/cloud-init/files/22.1-fix-update_package_sources-function.patch b/app-emulation/cloud-init/files/22.1-fix-update_package_sources-function.patch deleted file mode 100644 index 7a1b938e4e60..000000000000 --- a/app-emulation/cloud-init/files/22.1-fix-update_package_sources-function.patch +++ /dev/null @@ -1,21 +0,0 @@ -From b15c4c4b24c894b3c8d444466110c881c35525e2 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 14 Nov 2018 15:35:37 +0100 -Subject: [PATCH 4/5] gentoo: fix update_package_sources function - -Method is meant to update packages repository, not to update the system. ---- - -diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py -index 702cda8a..37217fe4 100644 ---- a/cloudinit/distros/gentoo.py -+++ b/cloudinit/distros/gentoo.py -@@ -246,7 +246,7 @@ class Distro(distros.Distro): - self._runner.run( - "update-sources", - self.package_command, -- ["-u", "world"], -+ ["--sync"], - freq=PER_INSTANCE, - ) - diff --git a/app-emulation/cloud-init/files/cloud-init-18.4-fix-packages-module.patch b/app-emulation/cloud-init/files/cloud-init-18.4-fix-packages-module.patch deleted file mode 100644 index 4a42cbb7d9e1..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-18.4-fix-packages-module.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e894c6f57b88305cdf6e4e2b1543475b2e02f436 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Tue, 23 Oct 2018 18:59:58 +0200 -Subject: [PATCH 1/2] Fix Gentoo package installation command - ---- - cloudinit/distros/gentoo.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py -index dc57717d..98ac41ca 100644 ---- a/cloudinit/distros/gentoo.py -+++ b/cloudinit/distros/gentoo.py -@@ -192,7 +192,7 @@ class Distro(distros.Distro): - if pkgs is None: - pkgs = [] - -- cmd = list('emerge') -+ cmd = ['emerge'] - # Redirect output - cmd.append("--quiet") - --- -2.19.0 - diff --git a/app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch deleted file mode 100644 index ec6063d0c68a..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -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 2020-12-27 18:35:39.107000000 +0000 -+++ b/config/cloud.cfg.tmpl 2020-12-27 18:38:23.982000000 +0000 -@@ -154,7 +154,7 @@ cloud_final_modules: - system_info: - # This will affect which distro class gets used - {% if variant in ["alpine", "amazon", "arch", "centos", "debian", -- "fedora", "freebsd", "netbsd", "openbsd", "rhel", -+ "fedora", "freebsd", "gentoo", "netbsd", "openbsd", "rhel", - "suse", "ubuntu"] %} - distro: {{ variant }} - {% else %} -@@ -206,7 +206,7 @@ system_info: - primary: http://ports.ubuntu.com/ubuntu-ports - security: http://ports.ubuntu.com/ubuntu-ports - ssh_svcname: ssh --{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora", -+{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora", "gentoo", - "rhel", "suse"] %} - # Default user name + that default users groups (if added/used) - default_user: -@@ -221,6 +221,10 @@ system_info: - {% endif %} - {% if variant == "suse" %} - groups: [cdrom, users] -+{% elif variant == "gentoo" %} -+ groups: [users, wheel] -+ primary_group: users -+ no_user_group: true - {% elif variant == "alpine" %} - groups: [adm, sudo] - {% elif variant == "arch" %} -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 2020-12-27 18:44:22.032049636 +0000 -+++ a/tools/render-cloudcfg 2020-12-27 18:44:41.632619051 +0000 -@@ -5,7 +5,7 @@ import os - import sys - - VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora", -- "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu", -+ "freebsd", "gentoo", "netbsd", "openbsd", "rhel", "suse", "ubuntu", - "unknown"] diff --git a/app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch deleted file mode 100644 index fb4eed77fcbc..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -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 ["alpine", "amazon", "arch", "centos", "debian", -- "fedora", "freebsd", "netbsd", "openbsd", "rhel", -- "suse", "ubuntu"] %} -+{% if variant in ["alpine", "amazon", "arch", "centos", "debian", -+ "fedora", "freebsd", "gentoo", "netbsd", -+ "openbsd", "rhel", "suse", "ubuntu"] %} - 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 ["alpine", "amazon", "arch", "centos", "fedora", -- "rhel", "suse"] %} -+{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora", -+ "gentoo", "rhel", "suse"] %} - # Default user name + that default users groups (if added/used) - default_user: - name: {{ variant }} -@@ -180,6 +180,10 @@ system_info: - {% endif %} - {% if variant == "suse" %} - groups: [cdrom, users] -+{% elif variant == "gentoo" %} -+ groups: [users, wheel] -+ primary_group: users -+ no_user_group: true - {% elif variant == "arch" %} - groups: [wheel, users] - {% else %} -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 = ["alpine", "amazon", "arch", "centos", "debian", "fedora", -- "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu", -- "unknown"] -+VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora", -+ "freebsd", "gentoo", "netbsd", "openbsd", "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 - -- cgit v1.2.3