diff --git a/SOURCES/cloud-init-22.1-add_msvsphere.patch b/SOURCES/cloud-init-22.1-add_msvsphere.patch index 601eddd..0ade5f8 100644 --- a/SOURCES/cloud-init-22.1-add_msvsphere.patch +++ b/SOURCES/cloud-init-22.1-add_msvsphere.patch @@ -68,33 +68,33 @@ index 4cb2155..36d901f 100644 "photon", "rhel", diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl -index 80ab4f9..26b5ce1 100644 +index 08b6efb..b5fed23 100644 --- a/config/cloud.cfg.tmpl +++ b/config/cloud.cfg.tmpl -@@ -33,7 +33,7 @@ disable_root: true +@@ -34,7 +34,7 @@ disable_root: true {% endif %} - {% if variant in ["almalinux", "alpine", "amazon", "centos", "cloudlinux", "eurolinux", -- "fedora", "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %} -+ "fedora", "miraclelinux", "msvsphere", "openEuler", "rhel", "rocky", "virtuozzo"] %} - {% if variant == "rhel" %} + {% if variant in ["almalinux", "alpine", "amazon", "cloudlinux", "eurolinux", +- "fedora", "miraclelinux", "openEuler", "openmandriva", "rocky", "virtuozzo"] or is_rhel %} ++ "fedora", "miraclelinux", "msvsphere", "openEuler", "openmandriva", "rocky", "virtuozzo"] or is_rhel %} + {% if is_rhel %} mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service,_netdev', '0', '2'] {% else %} -@@ -194,7 +194,7 @@ cloud_final_modules: +@@ -195,7 +195,7 @@ cloud_final_modules: system_info: # This will affect which distro class gets used - {% if variant in ["almalinux", "alpine", "amazon", "arch", "centos", "cloudlinux", "debian", + {% if variant in ["almalinux", "alpine", "amazon", "arch", "cloudlinux", "debian", - "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "miraclelinux", "openbsd", "openEuler", + "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "miraclelinux", "msvsphere", "openbsd", "openEuler", - "photon", "rhel", "rocky", "suse", "ubuntu", "virtuozzo"] %} + "openmandriva", "photon", "rocky", "suse", "ubuntu", "virtuozzo"] or is_rhel %} distro: {{ variant }} {% elif variant in ["dragonfly"] %} -@@ -249,7 +249,7 @@ system_info: +@@ -250,7 +250,7 @@ system_info: security: http://ports.ubuntu.com/ubuntu-ports ssh_svcname: ssh - {% elif variant in ["almalinux", "alpine", "amazon", "arch", "centos", "cloudlinux", "eurolinux", -- "fedora", "gentoo", "miraclelinux", "openEuler", "rhel", "rocky", "suse", "virtuozzo"] %} -+ "fedora", "gentoo", "miraclelinux", "msvsphere", "openEuler", "rhel", "rocky", "suse", "virtuozzo"] %} + {% elif variant in ["almalinux", "alpine", "amazon", "arch", "cloudlinux", "eurolinux", +- "fedora", "gentoo", "miraclelinux", "openEuler", "openmandriva", "rocky", "suse", "virtuozzo"] or is_rhel %} ++ "fedora", "gentoo", "miraclelinux", "msvsphere", "openEuler", "openmandriva", "rocky", "suse", "virtuozzo"] or is_rhel %} # Default user name + that default users groups (if added/used) default_user: {% if variant == "amazon" %} @@ -138,7 +138,7 @@ index fc984d5..4a453eb 100644 After=NetworkManager.service After=NetworkManager-wait-online.service diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg -index afe999e..c727370 100755 +index 176df36..cd8ccf5 100755 --- a/tools/render-cloudcfg +++ b/tools/render-cloudcfg @@ -22,6 +22,7 @@ def main(): @@ -149,3 +149,6 @@ index afe999e..c727370 100755 "netbsd", "openbsd", "openEuler", +-- +2.39.2 +