From 9d167075a7195e506ea82e5bac7eb160e59b6465 Mon Sep 17 00:00:00 2001 From: ScottH <59572507+sharder996@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:30:42 +0000 Subject: [PATCH] Merge pull request #3393 from canonical/add-missing-pollinate-package [daemon] Add pollinate package to internal cloud-init --- src/daemon/daemon.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index 1709b1a05f..ab4cab17e2 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -144,6 +144,7 @@ auto make_cloud_init_vendor_config(const mp::SSHKeyProvider& key_provider, const config["ssh_authorized_keys"].push_back(ssh_key_line); config["timezone"] = request->time_zone(); config["system_info"]["default_user"]["name"] = username; + config["packages"].push_back("pollinate"); auto pollinate_user_agent_string = fmt::format("multipass/version/{} # written by Multipass\n", multipass::version_string); @@ -215,6 +216,15 @@ void prepare_user_data(YAML::Node& user_data_config, YAML::Node& vendor_config) auto keys = user_data_config["ssh_authorized_keys"]; if (keys.IsSequence()) keys.push_back(vendor_config["ssh_authorized_keys"][0]); + + auto packages = user_data_config["packages"]; + if (packages.IsSequence()) + { + for (const auto& package : vendor_config["packages"]) + { + packages.push_back(package); + } + } } template