Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package google-guest-agent for openSUSE:Factory checked in at 2025-09-11 14:41:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-guest-agent (Old) and /work/SRC/openSUSE:Factory/.google-guest-agent.new.1977 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-guest-agent" Thu Sep 11 14:41:58 2025 rev:52 rq:1304069 version:20250908.00 Changes: -------- --- /work/SRC/openSUSE:Factory/google-guest-agent/google-guest-agent.changes 2025-09-02 18:02:13.676345830 +0200 +++ /work/SRC/openSUSE:Factory/.google-guest-agent.new.1977/google-guest-agent.changes 2025-09-11 14:47:41.436975239 +0200 @@ -1,0 +2,66 @@ +Tue Sep 9 14:06:39 UTC 2025 - John Paul Adrian Glaubitz <[email protected]> + +- Update to version 20250908.00 + * Update go version for stable branch to 1.25 (#571) + * Add adapt script in stable branch as per #569 (#570) + * Backport fix from #567 to stable branch (#568) + * Revert compat behavior and call known binary directly (#560) + * Revert compat behavior and call known binary directly (#559) + * Build rollforward package to re-enable original agent and + disable core plugin (#557) +- from version 20250907.00 + * Update go version to 1.25 (#565) + * Add compat adapt script to windows in agent sysprep (#569) + * Fix adapt to use more portable shebang line (#567) + * Remove routes script from packaging (#566) + * Update adapt script to run on startup/shutdown both (#561) + * Update agent_uninstall.ps1 (#558) + * Stop core plugin before removing agent package (#554) + * Startup scripts should start after agent manager instead (#553) + * Update presets and install dependencies on systemd units (#552) + * Ensure agent service is disabled (#551) + * Disable legacy agent to enable core plugin (#550) + * Final fix for RHEL packaging for routes setup (#549) + * Fix RHEL packaging for routes scripts (#548) + * Packaging changes to include routes script installation (#542) + * Update CLI name in packaging (#543) + * systemd should manage only the main process (#544) +- from version 20250905.01 + * Update go version for stable branch to 1.25 (#571) + * Add adapt script in stable branch as per #569 (#570) + * Backport fix from #567 to stable branch (#568) + * Revert compat behavior and call known binary directly (#560) + * Revert compat behavior and call known binary directly (#559) + * Build rollforward package to re-enable original agent and + disable core plugin (#557) +- from version 20250905.00 + * Update go version to 1.25 (#565) + * Add compat adapt script to windows in agent sysprep (#569) + * Fix adapt to use more portable shebang line (#567) + * Remove routes script from packaging (#566) + * Update adapt script to run on startup/shutdown both (#561) + * Update agent_uninstall.ps1 (#558) + * Stop core plugin before removing agent package (#554) + * Startup scripts should start after agent manager instead (#553) + * Update presets and install dependencies on systemd units (#552) + * Ensure agent service is disabled (#551) + * Disable legacy agent to enable core plugin (#550) + * Final fix for RHEL packaging for routes setup (#549) + * Fix RHEL packaging for routes scripts (#548) + * Packaging changes to include routes script installation (#542) + * Update CLI name in packaging (#543) + * systemd should manage only the main process (#544) +- from version 20250902.00 + * Update go version for stable branch to 1.25 (#571) + * Add adapt script in stable branch as per #569 (#570) + * Backport fix from #567 to stable branch (#568) + * Revert compat behavior and call known binary directly (#560) + * Revert compat behavior and call known binary directly (#559) + * Build rollforward package to re-enable original agent and + disable core plugin (#557) +- Build and install new gce_workload_cert_refresh binary +- Fix installation source of google_metadata_script_runner_adapt script +- Install new systemd service file + * gce-workload-cert-refresh.service + +------------------------------------------------------------------- Old: ---- guest-agent-20250901.00.tar.gz New: ---- guest-agent-20250908.00.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-guest-agent.spec ++++++ --- /var/tmp/diff_new_pack.tpeGBk/_old 2025-09-11 14:47:42.020999917 +0200 +++ /var/tmp/diff_new_pack.tpeGBk/_new 2025-09-11 14:47:42.025000086 +0200 @@ -24,7 +24,7 @@ %global import_path %{provider_prefix} Name: google-guest-agent -Version: 20250901.00 +Version: 20250908.00 Release: 0 Summary: Google Cloud Guest Agent License: Apache-2.0 @@ -54,7 +54,7 @@ %build %goprep %{import_path} -for bin in google_guest_agent google_metadata_script_runner; do +for bin in gce_workload_cert_refresh google_guest_agent google_metadata_script_runner; do pushd "$bin" CGO_ENABLED=0 go build -buildmode=pie -ldflags="-s -w -X main.version=%{version}" -mod=vendor popd @@ -62,15 +62,17 @@ %install install -d %{buildroot}%{_bindir} +install -p -m 0755 gce_workload_cert_refresh/gce_workload_cert_refresh %{buildroot}%{_bindir}/gce_workload_cert_refresh install -p -m 0755 google_guest_agent/google_guest_agent %{buildroot}%{_bindir}/google_guest_agent install -p -m 0755 google_metadata_script_runner/google_metadata_script_runner %{buildroot}%{_bindir}/google_metadata_script_runner -install -p -m 0755 google_metadata_script_runner/google_metadata_script_runner %{buildroot}%{_bindir}/google_metadata_script_runner_adapt +install -p -m 0755 google_metadata_script_runner_adapt %{buildroot}%{_bindir}/google_metadata_script_runner_adapt install -d %{buildroot}/usr/share/google-guest-agent install -p -m 0644 instance_configs.cfg %{buildroot}/usr/share/google-guest-agent/instance_configs.cfg install -d %{buildroot}%{_unitdir} install -p -m 0644 %{name}.service %{buildroot}%{_unitdir} install -p -m 0644 google-startup-scripts.service %{buildroot}%{_unitdir} install -p -m 0644 google-shutdown-scripts.service %{buildroot}%{_unitdir} +install -p -m 0644 gce-workload-cert-refresh.service %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_sbindir} for srv_name in %{buildroot}%{_unitdir}/*.service; do rc_name=$(basename -s '.service' $srv_name); ln -s service %{buildroot}%{_sbindir}/rc$rc_name; done @@ -83,10 +85,10 @@ systemctl stop --no-block google-network-setup systemctl disable google-network-setup.service fi - %service_add_pre google-guest-agent.service google-shutdown-scripts.service google-startup-scripts.service + %service_add_pre google-guest-agent.service google-shutdown-scripts.service google-startup-scripts.service gce-workload-cert-refresh.service %preun - %service_del_preun google-guest-agent.service google-shutdown-scripts.service google-startup-scripts.service + %service_del_preun google-guest-agent.service google-shutdown-scripts.service google-startup-scripts.service gce-workload-cert-refresh.service %post # Handle enabling of services during an upgrade from the old google-compute-engine-init package @@ -103,7 +105,7 @@ mktemp --suffix ".google-shutdown-scripts" fi - %service_add_post google-guest-agent.service google-shutdown-scripts.service google-startup-scripts.service + %service_add_post google-guest-agent.service google-shutdown-scripts.service google-startup-scripts.service gce-workload-cert-refresh.service %posttrans if ! [ -e /.buildenv ] && [ -f /tmp/tmp\.[A-Z,a-z,0-9]*\.google-accounts-daemon-enabled ] ; then @@ -125,7 +127,7 @@ fi %postun - %service_del_postun google-guest-agent.service google-shutdown-scripts.service google-startup-scripts.service + %service_del_postun google-guest-agent.service google-shutdown-scripts.service google-startup-scripts.service gce-workload-cert-refresh.service %files %defattr(0644,root,root,0755) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.tpeGBk/_old 2025-09-11 14:47:42.053001269 +0200 +++ /var/tmp/diff_new_pack.tpeGBk/_new 2025-09-11 14:47:42.057001438 +0200 @@ -3,8 +3,8 @@ <param name="url">https://github.com/GoogleCloudPlatform/guest-agent/</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">20250901.00</param> - <param name="revision">20250901.00</param> + <param name="versionformat">20250908.00</param> + <param name="revision">20250908.00</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> @@ -15,7 +15,7 @@ <param name="basename">guest-agent</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">guest-agent-20250901.00.tar.gz</param> + <param name="archive">guest-agent-20250908.00.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.tpeGBk/_old 2025-09-11 14:47:42.073002115 +0200 +++ /var/tmp/diff_new_pack.tpeGBk/_new 2025-09-11 14:47:42.077002283 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/GoogleCloudPlatform/guest-agent/</param> - <param name="changesrevision">d434571735529d7ee7f3e3534c32a934e6ac2b9b</param></service></servicedata> + <param name="changesrevision">9f87bb038c721bfdfe74a771bbf9576e10d0e8a3</param></service></servicedata> (No newline at EOF) ++++++ guest-agent-20250901.00.tar.gz -> guest-agent-20250908.00.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/90-google-guest-agent.preset new/guest-agent-20250908.00/90-google-guest-agent.preset --- old/guest-agent-20250901.00/90-google-guest-agent.preset 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/90-google-guest-agent.preset 2025-08-30 08:23:23.000000000 +0200 @@ -1,6 +1,4 @@ -disable google-guest-agent.service +enable google-guest-agent.service enable google-shutdown-scripts.service enable google-startup-scripts.service -disable gce-workload-cert-refresh.timer -enable google-guest-compat-manager.service -enable google-guest-agent-manager.service \ No newline at end of file +enable gce-workload-cert-refresh.timer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/core-plugin-enabled new/guest-agent-20250908.00/core-plugin-enabled --- old/guest-agent-20250901.00/core-plugin-enabled 1970-01-01 01:00:00.000000000 +0100 +++ new/guest-agent-20250908.00/core-plugin-enabled 2025-08-30 08:23:23.000000000 +0200 @@ -0,0 +1,2 @@ +# Please do not edit this file manually. +enabled=false \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/google-guest-agent-manager.service new/guest-agent-20250908.00/google-guest-agent-manager.service --- old/guest-agent-20250901.00/google-guest-agent-manager.service 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/google-guest-agent-manager.service 2025-08-30 08:23:23.000000000 +0200 @@ -1,7 +1,5 @@ [Unit] Description=Google Compute Engine Guest Agent Plugin Manager -# Start before sshd in order to regenerate SSH host keys. -Before=sshd.service After=network-online.target syslog.service After=network.service networking.service NetworkManager.service systemd-networkd.service @@ -10,9 +8,6 @@ ExecStart=/usr/bin/google_guest_agent_manager OOMScoreAdjust=-999 Restart=always -KillMode=process [Install] -WantedBy=sshd.service WantedBy=multi-user.target -WantedBy=network.service networking.service NetworkManager.service systemd-networkd.service \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/google-startup-scripts.service new/guest-agent-20250908.00/google-startup-scripts.service --- old/guest-agent-20250901.00/google-startup-scripts.service 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/google-startup-scripts.service 2025-08-30 08:23:23.000000000 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Google Compute Engine Startup Scripts Wants=network-online.target rsyslog.service -After=network-online.target rsyslog.service google-guest-agent-manager.service +After=network-online.target rsyslog.service google-guest-agent.service Before=apt-daily.service [Service] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/google_metadata_script_runner_adapt new/guest-agent-20250908.00/google_metadata_script_runner_adapt --- old/guest-agent-20250901.00/google_metadata_script_runner_adapt 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/google_metadata_script_runner_adapt 2025-08-30 08:23:23.000000000 +0200 @@ -2,11 +2,9 @@ # # This script wraps compatibility logic of guest agent's startup script # runner. If compat manager is present run it, otherwise launch the -# known service binary. +# known service binary. In case the package is to revert back to previous +# version of guest-agent without core plugin it directly launches known service +# binary. # -if [ -e /usr/bin/gce_compat_metadata_script_runner ]; then - /usr/bin/gce_compat_metadata_script_runner $1 -else - /usr/bin/google_metadata_script_runner $1 -fi \ No newline at end of file +/usr/bin/google_metadata_script_runner $1 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/google_metadata_script_runner_adapt.ps1 new/guest-agent-20250908.00/google_metadata_script_runner_adapt.ps1 --- old/guest-agent-20250901.00/google_metadata_script_runner_adapt.ps1 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/google_metadata_script_runner_adapt.ps1 2025-08-30 08:23:23.000000000 +0200 @@ -15,12 +15,10 @@ <# .SYNOPSIS Metadata Script Runner Adapt. - .DESCRIPTION This script wraps compatibility logic of guest agent's startup script runner. If compat manager is present run it, otherwise launch the known service binary. - .EXAMPLE .\google_metadata_script_runner_adapt.ps1 <startup|shutdown|specialize> #> @@ -35,17 +33,6 @@ $script:gce_install_dir = 'C:\Program Files\Google\Compute Engine' $script:orig_runner = "$script:gce_install_dir\metadata_scripts\GCEMetadataScripts.exe" $script:metadata_script_loc = $script:orig_runner -$script:compatRunner = "$script:gce_install_dir\metadata_scripts\GCECompatMetadataScripts.exe" -$script:runnerV2 = "$script:gce_install_dir\agent\GCEMetadataScriptRunner.exe" - -if (Test-Path $script:runnerV2) { - $script:metadata_script_loc = $script:runnerV2 -} - -if (Test-Path $script:compatRunner) { - $script:metadata_script_loc = $script:compatRunner -} Write-Host "Launching metadata scripts from $script:metadata_script_loc for $phase" -# Call startup script during sysprep specialize phase. & $script:metadata_script_loc $phase \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/packaging/debian/postinst new/guest-agent-20250908.00/packaging/debian/postinst --- old/guest-agent-20250901.00/packaging/debian/postinst 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/packaging/debian/postinst 2025-08-30 08:23:23.000000000 +0200 @@ -14,9 +14,16 @@ fi fi - # Disable and stop this service in favor of core plugin to be run on default. - systemctl disable 'google-guest-agent.service' > /dev/null || true - systemctl stop 'google-guest-agent.service' > /dev/null || true + # Disable and stop this service in favor of original guest-agent instead of core plugin. + systemctl disable 'google-guest-compat-manager.service' > /dev/null || true + systemctl stop 'google-guest-compat-manager.service' > /dev/null || true + + # Stop core plugin. + ggactl_plugin coreplugin stop >/dev/null 2>&1 || : + + # Enable the legacy agent again. + systemctl enable 'google-guest-agent.service' > /dev/null || true + systemctl start 'google-guest-agent.service' > /dev/null || true fi #DEBHELPER# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/packaging/debian/prerm new/guest-agent-20250908.00/packaging/debian/prerm --- old/guest-agent-20250901.00/packaging/debian/prerm 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/packaging/debian/prerm 2025-08-30 08:23:23.000000000 +0200 @@ -2,7 +2,6 @@ if [ "$1" = "purge" -o "$1" = "remove" ] ; then systemctl stop google-guest-agent-manager >/dev/null 2>&1 || : - ggactl_plugin coreplugin stop >/dev/null 2>&1 || : ggactl_plugin dynamic-cleanup >/dev/null 2>&1 || : fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/packaging/debian/rules new/guest-agent-20250908.00/packaging/debian/rules --- old/guest-agent-20250901.00/packaging/debian/rules 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/packaging/debian/rules 2025-08-30 08:23:23.000000000 +0200 @@ -32,6 +32,8 @@ install -p -m 0755 google-guest-agent/cmd/ggactl/ggactl_plugin debian/google-guest-agent/usr/bin/ggactl_plugin;\ install -p -m 0755 google-guest-agent/cmd/core_plugin/core_plugin debian/google-guest-agent/usr/lib/google/guest_agent/core_plugin;\ install -p -m 0755 google-guest-agent/cmd/metadata_script_runner_compat/gce_compat_metadata_script_runner debian/google-guest-agent/usr/bin/gce_compat_metadata_script_runner;\ + install -d debian/google-guest-agent/etc/google-guest-agent;\ + install -p -m 0755 core-plugin-enabled debian/google-guest-agent/etc/google-guest-agent/core-plugin-enabled;\ fi override_dh_golang: @@ -61,21 +63,16 @@ fi install -d debian/google-guest-agent/lib/systemd/system-preset install -p -m 0644 *.preset debian/google-guest-agent/lib/systemd/system-preset/ - dh_systemd_enable google-startup-scripts.service google-shutdown-scripts.service + dh_systemd_enable google-guest-agent.service google-startup-scripts.service google-shutdown-scripts.service gce-workload-cert-refresh.timer if [ -d google-guest-agent ]; then\ dh_systemd_enable google-guest-compat-manager.service;\ dh_systemd_enable google-guest-agent-manager.service;\ fi -override_dh_installsystemd: - if [ -d google-guest-agent ]; then\ - dh_installsystemd google-guest-compat-manager.service;\ - dh_installsystemd google-guest-agent-manager.service;\ - dh_installsystemd --no-enable --no-start google-guest-agent.service;\ - dh_installsystemd --no-enable --no-start gce-workload-cert-refresh.timer;\ - fi - override_dh_systemd_start: + # Only perform start/stop actions for the guest agent and cert refresh timer. + dh_systemd_start google-guest-agent.service + dh_systemd_start gce-workload-cert-refresh.timer if [ -d google-guest-agent ]; then\ dh_systemd_start google-guest-compat-manager.service;\ dh_systemd_start google-guest-agent-manager.service;\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/packaging/googet/agent_install.ps1 new/guest-agent-20250908.00/packaging/googet/agent_install.ps1 --- old/guest-agent-20250901.00/packaging/googet/agent_install.ps1 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/packaging/googet/agent_install.ps1 2025-08-30 08:23:23.000000000 +0200 @@ -27,6 +27,8 @@ $compat_display_name = 'Google Compute Engine Compat Manager' $compat_description = 'Google Compute Engine Compat Manager' +$ggactl_exe = "C:\Program Files\Google\Compute Engine\agent\ggactl_plugin.exe" + $initial_config = @' # GCE Instance Configuration @@ -101,13 +103,16 @@ $initial_config | Set-Content -Path $config -Encoding ASCII } + & sc.exe config $name start=auto + Restart-Service $name -Verbose + if ($install_manager) { - & sc.exe config $name start=disabled - Stop-Service $name - Restart-Service $compat_manager -Verbose - Restart-Service $manager_name -Verbose - } else { - Restart-Service $name -Verbose + & sc.exe config $compat_manager start=disabled + Stop-Service $compat_manager -Verbose + + Stop-Service $manager_name -Verbose + & $ggactl_exe coreplugin stop + Start-Service $manager_name -Verbose } } catch { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/packaging/googet/agent_uninstall.ps1 new/guest-agent-20250908.00/packaging/googet/agent_uninstall.ps1 --- old/guest-agent-20250901.00/packaging/googet/agent_uninstall.ps1 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/packaging/googet/agent_uninstall.ps1 2025-08-30 08:23:23.000000000 +0200 @@ -12,10 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -if (Get-Service GCEAgent -ErrorAction SilentlyContinue) { - Stop-Service GCEAgent -Verbose - & sc.exe delete GCEAgent -} +Stop-Service GCEAgent -Verbose +& sc.exe delete GCEAgent $compat_manager = 'GCEWindowsCompatManager' $name = 'GCEAgentManager' @@ -30,7 +28,6 @@ # Stop Guest Agent Manager, cleanup all plugins (if present) and delete the service. if (Get-Service $name -ErrorAction SilentlyContinue) { Stop-Service $name -Verbose - & $cleanup_exe coreplugin stop & $cleanup_exe dynamic-cleanup & sc.exe delete $name } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/packaging/googet/google-compute-engine-windows.goospec new/guest-agent-20250908.00/packaging/googet/google-compute-engine-windows.goospec --- old/guest-agent-20250901.00/packaging/googet/google-compute-engine-windows.goospec 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/packaging/googet/google-compute-engine-windows.goospec 2025-08-30 08:23:23.000000000 +0200 @@ -9,6 +9,7 @@ "files": { "CorePlugin.exe": "<ProgramFiles>/Google/Compute Engine/agent/CorePlugin.exe", "google_metadata_script_runner_adapt.ps1": "<ProgramFiles>/Google/Compute Engine/agent/google_metadata_script_runner_adapt.ps1", + "core-plugin-enabled": "<ProgramData>/Google/Compute Engine/google-guest-agent/core-plugin-enabled", "GCEMetadataScriptRunner.exe": "<ProgramFiles>/Google/Compute Engine/agent/GCEMetadataScriptRunner.exe", "GCEWindowsAgentManager.exe": "<ProgramFiles>/Google/Compute Engine/agent/GCEWindowsAgentManager.exe", "GCEWindowsCompatManager.exe": "<ProgramFiles>/Google/Compute Engine/agent/GCEWindowsCompatManager.exe", @@ -45,6 +46,7 @@ "sources": [{ "include": [ "CorePlugin.exe", + "core-plugin-enabled", "ggactl_plugin.exe", "GCEWindowsAgent.exe", "GCECompatMetadataScripts.exe", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/packaging/googet/run_shutdown_scripts.cmd new/guest-agent-20250908.00/packaging/googet/run_shutdown_scripts.cmd --- old/guest-agent-20250901.00/packaging/googet/run_shutdown_scripts.cmd 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/packaging/googet/run_shutdown_scripts.cmd 2025-08-30 08:23:23.000000000 +0200 @@ -16,8 +16,5 @@ REM Run shutdown scripts that should happen as soon as the instance REM begins to power down -IF EXIST "C:\Program Files\Google\Compute Engine\metadata_scripts\GCECompatMetadataScripts.exe" ( - "C:\Program Files\Google\Compute Engine\metadata_scripts\GCECompatMetadataScripts.exe" "shutdown" -) ELSE ( - "C:\Program Files\Google\Compute Engine\metadata_scripts\GCEMetadataScripts.exe" "shutdown" -) +"C:\Program Files\Google\Compute Engine\metadata_scripts\GCEMetadataScripts.exe" "shutdown" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/packaging/googet/run_startup_scripts.cmd new/guest-agent-20250908.00/packaging/googet/run_startup_scripts.cmd --- old/guest-agent-20250901.00/packaging/googet/run_startup_scripts.cmd 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/packaging/googet/run_startup_scripts.cmd 2025-08-30 08:23:23.000000000 +0200 @@ -19,8 +19,4 @@ REM We execute the startup script asynchronously so it may run without REM this three day maximum runtime limitation. -IF EXIST "C:\Program Files\Google\Compute Engine\metadata_scripts\GCECompatMetadataScripts.exe" ( - start "" "C:\Program Files\Google\Compute Engine\metadata_scripts\GCECompatMetadataScripts.exe" "startup" -) ELSE ( - start "" "C:\Program Files\Google\Compute Engine\metadata_scripts\GCEMetadataScripts.exe" "startup" -) \ No newline at end of file +start "" "C:\Program Files\Google\Compute Engine\metadata_scripts\GCEMetadataScripts.exe" "startup" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20250901.00/packaging/google-guest-agent.spec new/guest-agent-20250908.00/packaging/google-guest-agent.spec --- old/guest-agent-20250901.00/packaging/google-guest-agent.spec 2025-08-30 06:33:23.000000000 +0200 +++ new/guest-agent-20250908.00/packaging/google-guest-agent.spec 2025-08-30 08:23:23.000000000 +0200 @@ -92,6 +92,8 @@ install -p -m 0755 %{name}-extra-%{version}/cmd/google_guest_compat_manager/google_guest_compat_manager %{buildroot}%{_bindir}/google_guest_compat_manager install -p -m 0755 %{name}-extra-%{version}/cmd/core_plugin/core_plugin %{buildroot}%{_exec_prefix}/lib/google/guest_agent/core_plugin install -p -m 0755 %{name}-extra-%{version}/cmd/metadata_script_runner_compat/gce_compat_metadata_script_runner %{buildroot}%{_bindir}/gce_compat_metadata_script_runner +install -d %{buildroot}/etc/google-guest-agent +install -p -m 0755 core-plugin-enabled %{buildroot}/etc/google-guest-agent/core-plugin-enabled %endif %if 0%{?el6} @@ -129,6 +131,7 @@ %{_bindir}/google_guest_agent_manager %{_bindir}/ggactl_plugin %{_exec_prefix}/lib/google/guest_agent/core_plugin +/etc/google-guest-agent/core-plugin-enabled %endif %{_bindir}/google_metadata_script_runner @@ -165,20 +168,22 @@ # Use enable instead of preset because preset is not supported in # chroots. + systemctl enable google-guest-agent.service >/dev/null 2>&1 || : systemctl enable google-startup-scripts.service >/dev/null 2>&1 || : systemctl enable google-shutdown-scripts.service >/dev/null 2>&1 || : systemctl enable gce-workload-cert-refresh.timer >/dev/null 2>&1 || : %if 0%{?build_plugin_manager} - systemctl enable google-guest-compat-manager.service >/dev/null 2>&1 || : + systemctl disable google-guest-compat-manager.service >/dev/null 2>&1 || : systemctl enable google-guest-agent-manager.service >/dev/null 2>&1 || : %endif if [ -d /run/systemd/system ]; then systemctl daemon-reload >/dev/null 2>&1 || : + systemctl start google-guest-agent.service >/dev/null 2>&1 || : systemctl start gce-workload-cert-refresh.timer >/dev/null 2>&1 || : %if 0%{?build_plugin_manager} - systemctl start google-guest-compat-manager.service >/dev/null 2>&1 || : + systemctl stop google-guest-compat-manager.service >/dev/null 2>&1 || : systemctl start google-guest-agent-manager.service >/dev/null 2>&1 || : %endif fi @@ -187,18 +192,20 @@ else # Package upgrade %if 0%{?build_plugin_manager} - systemctl enable google-guest-compat-manager.service >/dev/null 2>&1 || : + systemctl disable google-guest-compat-manager.service >/dev/null 2>&1 || : systemctl enable google-guest-agent-manager.service >/dev/null 2>&1 || : - systemctl disable google-guest-agent.service >/dev/null 2>&1 || : + systemctl enable google-guest-agent.service >/dev/null 2>&1 || : %endif if [ -d /run/systemd/system ]; then systemctl daemon-reload >/dev/null 2>&1 || : %if 0%{?build_plugin_manager} - systemctl stop google-guest-agent.service >/dev/null 2>&1 || : - systemctl restart google-guest-compat-manager.service >/dev/null 2>&1 || : - systemctl restart google-guest-agent-manager.service >/dev/null 2>&1 || : + systemctl stop google-guest-compat-manager.service >/dev/null 2>&1 || : + systemctl stop google-guest-agent-manager.service >/dev/null 2>&1 || : + ggactl_plugin coreplugin stop >/dev/null 2>&1 || : + systemctl start google-guest-agent-manager.service >/dev/null 2>&1 || : %endif + systemctl restart google-guest-agent.service >/dev/null 2>&1 || : fi # Re-enable the guest agent service if core plugin was enabled, since the @@ -227,7 +234,6 @@ %if 0%{?build_plugin_manager} systemctl stop google-guest-compat-manager.service >/dev/null 2>&1 || : systemctl stop google-guest-agent-manager.service >/dev/null 2>&1 || : - ggactl_plugin coreplugin stop >/dev/null 2>&1 || : ggactl_plugin dynamic-cleanup >/dev/null 2>&1 || : %endif fi ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/google-guest-agent/vendor.tar.gz /work/SRC/openSUSE:Factory/.google-guest-agent.new.1977/vendor.tar.gz differ: char 126, line 1
