Merge ~kajiya/+git/gce-compute-image-packages:update-noble-to-20240607.00 into ~ubuntu-core-dev/+git/gce-compute-image-packages:ubuntu/noble

[Chloé Smith]

* d/ch entry for noble (LP: #2073164)
* Merge branch 'ubuntu-core-dev/ubuntu/master' into 'ubuntu-core-dev/ubuntu/noble'

[Utkarsh Gupta (utkarsh)]

Thank you, this is straightforward!

Sponsored:

$ dput ubuntu ../gce-compute-image-packages_20240607.00-0ubuntu1\~24.04.0_source.changes
Uploading gce-compute-image-packages using ftp to ubuntu (host: upload.ubuntu.com; directory: /ubuntu)
running supported-distribution: check whether the target distribution is currently supported (using distro-info)
{'allowed': ['release', 'proposed', 'backports', 'security'], 'known': ['release', 'proposed', 'updates', 'backports', 'security']}
running required-fields: check whether a field is present and non-empty in the changes file
running checksum: verify checksums before uploading
running suite-mismatch: check the target distribution for common errors
running check-debs: makes sure the upload contains a binary package
running gpg: check GnuPG signatures before the upload
Uploading gce-compute-image-packages_20240607.00-0ubuntu1~24.04.0.dsc
Uploading gce-compute-image-packages_20240607.00.orig.tar.xz
Uploading gce-compute-image-packages_20240607.00-0ubuntu1~24.04.0.debian.tar.xz
Uploading gce-compute-image-packages_20240607.00-0ubuntu1~24.04.0_source.buildinfo
Uploading gce-compute-image-packages_20240607.00-0ubuntu1~24.04.0_source.changes

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 4841351..292c9b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gce-compute-image-packages (20240607.00-0ubuntu1~24.04.0) noble; urgency=medium
+
+  * No-change rebuild for Noble Numbat (LP: #2073164)
+
+ -- Chloé 'kajiya' Smith <[e-mail]>  Fri, 26 Jul 2024 15:47:14 +0100
+
+gce-compute-image-packages (20240607.00-0ubuntu1) oracular; urgency=medium
+
+  * New upstream version 20240607.00. (LP: #2073164)
+
+ -- Chloé 'kajiya' Smith <[e-mail]>  Mon, 15 Jul 2024 18:33:54 +0100
+
 gce-compute-image-packages (20240307.00-0ubuntu1~24.04.0) noble; urgency=medium
 
   * Rebuild for Noble. (LP: #2066314)
diff --git a/packaging/debian/control b/packaging/debian/control
index 9bf6f87..6dc622f 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -11,6 +11,7 @@ Architecture: all
 Depends: google-compute-engine-oslogin,
          google-guest-agent,
          nvme-cli,
+         networkd-dispatcher,
          ${misc:Depends}
 Recommends: rsyslog | system-log-daemon
 Provides: irqbalance
diff --git a/packaging/debian/install b/packaging/debian/install
index 700a686..90f845d 100644
--- a/packaging/debian/install
+++ b/packaging/debian/install
@@ -2,6 +2,8 @@ etc/apt/apt.conf.d/*
 etc/modprobe.d/*
 etc/rsyslog.d/*
 etc/sysctl.d/*
+etc/NetworkManager/dispatcher.d/*
+usr/lib/networkd-dispatcher/*
 lib/udev/rules.d/*
 lib/udev/*
 usr/bin/*
diff --git a/packaging/google-compute-engine.spec b/packaging/google-compute-engine.spec
index 956303d..4822c7f 100644
--- a/packaging/google-compute-engine.spec
+++ b/packaging/google-compute-engine.spec
@@ -59,6 +59,7 @@ cp -a src/lib/dracut/* %{buildroot}/%{dracutdir}/
 %defattr(0644,root,root,0755)
 %attr(0755,-,-) %{_bindir}/*
 %attr(0755,-,-) /etc/dhcp/dhclient.d/google_hostname.sh
+%attr(0755,-,-) /etc/NetworkManager/dispatcher.d/google_hostname.sh
 %{_udevrulesdir}/*
 %attr(0755,-,-) %{_udevrulesdir}/../google_nvme_id
 %config /etc/dracut.conf.d/*
diff --git a/src/etc/NetworkManager/dispatcher.d/google_hostname.sh b/src/etc/NetworkManager/dispatcher.d/google_hostname.sh
new file mode 100755
index 0000000..7ff5376
--- /dev/null
+++ b/src/etc/NetworkManager/dispatcher.d/google_hostname.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Copyright 2024 Google LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+if [[ $2 == "up" ]]; then
+	new_host_name=$DHCP4_HOST_NAME new_ip_address=${DHCP4_IP_ADDRESS%%/*} google_set_hostname
+fi
+
diff --git a/src/usr/bin/google_set_hostname b/src/usr/bin/google_set_hostname
index 05a0412..78c9fc4 100755
--- a/src/usr/bin/google_set_hostname
+++ b/src/usr/bin/google_set_hostname
@@ -59,6 +59,11 @@ if [ -n "$new_host_name" ] && [ "${new_host_name%%.*}" != "$old_hostname" ] && !
     nmcli general hostname "${new_host_name%%.*}"
   fi
 
+  hostnamectl=$(which hostnamectl 2> /dev/null)
+  if [ -x "$hostnamectl" ]; then
+    hostnamectl hostname "${new_host_name%%.*}"
+  fi
+
   # Restart rsyslog to update the hostname.
   systemctl=$(which systemctl 2> /dev/null)
   if [ -x "$systemctl" ]; then
diff --git a/src/usr/bin/google_set_multiqueue b/src/usr/bin/google_set_multiqueue
index 8e51934..70eca28 100755
--- a/src/usr/bin/google_set_multiqueue
+++ b/src/usr/bin/google_set_multiqueue
@@ -105,7 +105,8 @@ function is_a3_platform() {
 
   [[ "$machine_type" == *"a3-highgpu-8g"* \
   || "$machine_type" == *"a3-ultragpu-8g"* \
-  || "$machine_type" == *"a3-megagpu-8g"* ]] || return 1
+  || "$machine_type" == *"a3-megagpu-8g"* \
+  || "$machine_type" == *"a3-edge-8g"* ]] || return 1
 
   return 0
 }
diff --git a/src/usr/lib/networkd-dispatcher/routable.d/google_hostname.sh b/src/usr/lib/networkd-dispatcher/routable.d/google_hostname.sh
new file mode 100755
index 0000000..656976a
--- /dev/null
+++ b/src/usr/lib/networkd-dispatcher/routable.d/google_hostname.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Copyright 2024 Google LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+new_host_name=$(curl -H 'Metadata-Flavor: Google' http://169.254.169.254/computeMetadata/v1/instance/hostname)
+new_ip_address=$ADDR new_host_name=$new_host_name google_set_hostname
+