From cc8cd79e0526639e05fcc3aa589eaa0372730f20 Mon Sep 17 00:00:00 2001 From: csoylu Date: Mon, 10 Jan 2022 17:39:48 +0100 Subject: [PATCH] Patch files for 6.4-2 --- qemu-server-6.4-2/Cloudinit.pm.patch | 156 +++++++++++++++++++++++++++ qemu-server-6.4-2/Qemu.pm.patch | 22 ++++ 2 files changed, 178 insertions(+) create mode 100644 qemu-server-6.4-2/Cloudinit.pm.patch create mode 100644 qemu-server-6.4-2/Qemu.pm.patch diff --git a/qemu-server-6.4-2/Cloudinit.pm.patch b/qemu-server-6.4-2/Cloudinit.pm.patch new file mode 100644 index 0000000..9528c00 --- /dev/null +++ b/qemu-server-6.4-2/Cloudinit.pm.patch @@ -0,0 +1,156 @@ +--- /usr/share/perl5/PVE/QemuServer/Cloudinit.pm.orig 2021-04-29 16:16:04.000000000 +0200 ++++ /usr/share/perl5/PVE/QemuServer/Cloudinit.pm 2022-01-10 17:36:46.174949937 +0100 +@@ -159,6 +159,12 @@ + sub configdrive2_network { + my ($conf) = @_; + ++ ## Support Windows ++ my $ostype = $conf->{"ostype"}; ++ my $default_dns = ''; ++ my $default_search = ''; ++ ## ++ + my $content = "auto lo\n"; + $content .= "iface lo inet loopback\n\n"; + +@@ -166,12 +172,15 @@ + if ($nameservers && @$nameservers) { + $nameservers = join(' ', @$nameservers); + $content .= " dns_nameservers $nameservers\n"; ++ $default_dns = $nameservers; # Support windows + } + if ($searchdomains && @$searchdomains) { + $searchdomains = join(' ', @$searchdomains); + $content .= " dns_search $searchdomains\n"; ++ $default_search = $searchdomains; # Support Windows + } + ++ my $dnsinserted = 0; + my @ifaces = grep { /^net(\d+)$/ } keys %$conf; + foreach my $iface (sort @ifaces) { + (my $id = $iface) =~ s/^net//; +@@ -189,6 +198,14 @@ + $content .= " address $addr\n"; + $content .= " netmask $mask\n"; + $content .= " gateway $net->{gw}\n" if $net->{gw}; ++ ++ ## Support windows ++ if(PVE::QemuServer::windows_version($ostype) && not($dnsinserted)) { ++ $content .= " dns-nameservers $default_dns\n"; ++ $content .= " dns-search $default_search\n"; ++ $dnsinserted++; ++ } ++ ## + } + } + if ($net->{ip6}) { +@@ -207,19 +224,95 @@ + return $content; + } + ++sub get_mac_addresses { ++ my ($conf) = @_; ++ ++ my $dhcpstring = undef; ++ my @dhcpmacs = (); ++ my @ifaces = grep { /^net(\d+)$/ } keys %$conf; ++ ++ foreach my $iface (sort @ifaces) { ++ (my $id = $iface) =~ s/^net//; ++ my $net = PVE::QemuServer::parse_net($conf->{$iface}); ++ next if !$conf->{"ipconfig$id"}; ++ my $ipconfig = PVE::QemuServer::parse_ipconfig($conf->{"ipconfig$id"}); ++ ++ my $mac = lc $net->{macaddr}; ++ ++ if (($ipconfig->{ip}) and ($ipconfig->{ip} eq 'dhcp')){ ++ push @dhcpmacs, $mac; ++ } ++ } ++ ++ if (@dhcpmacs){ ++ $dhcpstring .= ",\n \"dhcp\":["; ++ foreach my $mac (@dhcpmacs){ ++ if ($mac != @dhcpmacs[-1]){ ++ $dhcpstring .= "\"$mac\","; ++ } ++ else{ ++ $dhcpstring .= "\"$mac\"]"; ++ } ++ } ++ } ++ return ($dhcpstring); ++} ++ + sub configdrive2_gen_metadata { +- my ($user, $network) = @_; ++ my ($conf, $vmid, $user, $network) = @_; ++ ++ # Get DHCP nics by mac adresses ++ my $dhcpmacs = undef; ++ $dhcpmacs = get_mac_addresses($conf); + ++ # Get UUID + my $uuid_str = Digest::SHA::sha1_hex($user.$network); +- return configdrive2_metadata($uuid_str); ++ ++ # Get hostname ++ my ($hostname, $fqdn) = get_hostname_fqdn($conf, $vmid); ++ ++ # Get username, default to Administrator if none ++ my $username = "Administrator"; ++ if (defined($conf->{ciuser})){ ++ $username = $conf->{ciuser}; ++ } ++ ++ # Get user password ++ my $password = $conf->{cipassword}; ++ ++ # Get ssh keys and make a list out of it in json format ++ my $keystring = undef; ++ if (defined(my $pubkeys = $conf->{sshkeys})) { ++ $pubkeys = URI::Escape::uri_unescape($pubkeys); ++ my @pubkeysarray = split "\n", $pubkeys; ++ my $arraylength = @pubkeysarray; ++ my $incrementer = 1; ++ $keystring =",\n \"public_keys\": {\n"; ++ for my $key (@pubkeysarray){ ++ $keystring .= " \"SSH${incrementer}\" : \"${key}\""; ++ if ($arraylength != $incrementer){ ++ $keystring .= ",\n"; ++ }else{ ++ $keystring .= "\n }"; ++ } ++ $incrementer++; ++ } ++ } ++ ++ return configdrive2_metadata($password, $uuid_str, $hostname, $username, $keystring, $network, $dhcpmacs); + } + + sub configdrive2_metadata { +- my ($uuid) = @_; ++ my ($password, $uuid, $hostname, $username, $pubkeys, $network, $dhcpmacs) = @_; + return <<"EOF"; + { +- "uuid": "$uuid", +- "network_config": { "content_path": "/content/0000" } ++ "meta":{ ++ "admin_username": "$username", ++ "admin_pass": "$password", ++ "uuid":"$uuid", ++ "hostname":"$hostname" ++ }, ++ "network_config":{"content_path":"/content/0000"}$pubkeys$dhcpmacs + } + EOF + } +@@ -232,7 +325,7 @@ + $network_data = configdrive2_network($conf) if !defined($network_data); + + if (!defined($meta_data)) { +- $meta_data = configdrive2_gen_metadata($user_data, $network_data); ++ $meta_data = configdrive2_gen_metadata($conf, $vmid, $user_data, $network_data); + } + my $files = { + '/openstack/latest/user_data' => $user_data, diff --git a/qemu-server-6.4-2/Qemu.pm.patch b/qemu-server-6.4-2/Qemu.pm.patch new file mode 100644 index 0000000..687df67 --- /dev/null +++ b/qemu-server-6.4-2/Qemu.pm.patch @@ -0,0 +1,22 @@ +--- /usr/share/perl5/PVE/API2/Qemu.pm.orig 2021-04-29 16:16:04.000000000 +0200 ++++ /usr/share/perl5/PVE/API2/Qemu.pm 2022-01-03 12:16:43.275446612 +0100 +@@ -1084,10 +1084,17 @@ + + my $background_delay = extract_param($param, 'background_delay'); + ++ my $conf = PVE::QemuConfig->load_config($vmid); ++ ++ my $ostype = $conf->{ostype}; ++ ++ + if (defined(my $cipassword = $param->{cipassword})) { + # Same logic as in cloud-init (but with the regex fixed...) +- $param->{cipassword} = PVE::Tools::encrypt_pw($cipassword) +- if $cipassword !~ /^\$(?:[156]|2[ay])(\$.+){2}/; ++ if (!(PVE::QemuServer::windows_version($ostype))) { ++ $param->{cipassword} = PVE::Tools::encrypt_pw($cipassword) ++ if $cipassword !~ /^\$(?:[156]|2[ay])(\$.+){2}/; ++ } + } + + my @paramarr = (); # used for log message