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 2021-05-12 19:32:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-guest-agent (Old) and /work/SRC/openSUSE:Factory/.google-guest-agent.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-guest-agent" Wed May 12 19:32:52 2021 rev:4 rq:892548 version:20210414.00 Changes: -------- --- /work/SRC/openSUSE:Factory/google-guest-agent/google-guest-agent.changes 2021-04-01 14:19:17.772154661 +0200 +++ /work/SRC/openSUSE:Factory/.google-guest-agent.new.2988/google-guest-agent.changes 2021-05-12 19:33:33.838718413 +0200 @@ -1,0 +2,8 @@ +Tue May 11 08:08:42 UTC 2021 - John Paul Adrian Glaubitz <[email protected]> + +- Update to version 20210414.00 (bsc#1185848, bsc#1185849) + * start sshd (#106) + * Add systemd-networkd.service restart dependency. (#104) + * Update error message for handleHealthCheckRequest. (#105) + +------------------------------------------------------------------- Old: ---- guest-agent-20210223.01.tar.gz New: ---- guest-agent-20210414.00.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-guest-agent.spec ++++++ --- /var/tmp/diff_new_pack.CuVSki/_old 2021-05-12 19:33:34.522715681 +0200 +++ /var/tmp/diff_new_pack.CuVSki/_new 2021-05-12 19:33:34.526715665 +0200 @@ -24,7 +24,7 @@ %global import_path %{provider_prefix} Name: google-guest-agent -Version: 20210223.01 +Version: 20210414.00 Release: 0 Summary: Google Cloud Guest Agent License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.CuVSki/_old 2021-05-12 19:33:34.554715553 +0200 +++ /var/tmp/diff_new_pack.CuVSki/_new 2021-05-12 19:33:34.554715553 +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">20210223.01</param> - <param name="revision">20210223.01</param> + <param name="versionformat">20210414.00</param> + <param name="revision">20210414.00</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> @@ -15,6 +15,6 @@ <param name="basename">guest-agent</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">guest-agent-20210223.01.tar.gz</param> + <param name="archive">guest-agent-20210414.00.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.CuVSki/_old 2021-05-12 19:33:34.570715489 +0200 +++ /var/tmp/diff_new_pack.CuVSki/_new 2021-05-12 19:33:34.570715489 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/GoogleCloudPlatform/guest-agent/</param> - <param name="changesrevision">daa3b0c9a622fb60e46a1d1c59aba3e66767daee</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">cfc05e2e8fbbf36ae22544299257318f65162b27</param></service></servicedata> \ No newline at end of file ++++++ guest-agent-20210223.01.tar.gz -> guest-agent-20210414.00.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20210223.01/google-guest-agent.service new/guest-agent-20210414.00/google-guest-agent.service --- old/guest-agent-20210223.01/google-guest-agent.service 2021-02-23 23:46:14.000000000 +0100 +++ new/guest-agent-20210414.00/google-guest-agent.service 2021-04-15 00:44:12.000000000 +0200 @@ -1,10 +1,16 @@ [Unit] Description=Google Compute Engine Guest Agent +# Start before sshd in order to regenerate SSH host keys. Before=sshd.service -After=network-online.target rsyslog.service network.service networking.service -After=NetworkManager.service +# Start after network is online and restart when network service is restarted. +# Debian/Ubuntu 16.04: networking.service +# SLES/EL7: network.service (SLES via wicked.service) +# EL8: NetworkManager.service +# COS/Ubuntu 18.04+: systemd-networkd.service +After=network-online.target syslog.service +After=network.service networking.service NetworkManager.service systemd-networkd.service Wants=network-online.target -PartOf=network.service networking.service NetworkManager.service +PartOf=network.service networking.service NetworkManager.service systemd-networkd.service [Service] Type=simple diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20210223.01/google_guest_agent/non_windows_accounts.go new/guest-agent-20210414.00/google_guest_agent/non_windows_accounts.go --- old/guest-agent-20210223.01/google_guest_agent/non_windows_accounts.go 2021-02-23 23:46:14.000000000 +0100 +++ new/guest-agent-20210414.00/google_guest_agent/non_windows_accounts.go 2021-04-15 00:44:12.000000000 +0200 @@ -178,6 +178,15 @@ if err := writeGoogleUsersFile(); err != nil { logger.Errorf("Error writing google_users file: %v.", err) } + + // Start SSHD if not started. We do this in agent instead of adding a + // Wants= directive, and here instead of instance setup, so that this + // can be disabled by the instance configs file. + for _, svc := range []string{"ssh", "sshd"} { + // Ignore output, it's just a best effort. + startService(svc, false) + } + return nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20210223.01/google_guest_agent/oslogin.go new/guest-agent-20210414.00/google_guest_agent/oslogin.go --- old/guest-agent-20210223.01/google_guest_agent/oslogin.go 2021-02-23 23:46:14.000000000 +0100 +++ new/guest-agent-20210414.00/google_guest_agent/oslogin.go 2021-04-15 00:44:12.000000000 +0200 @@ -103,12 +103,22 @@ logger.Errorf("Error updating group.conf: %v.", err) } - for _, svc := range []string{"ssh", "sshd", "nscd", "unscd", "systemd-logind", "cron", "crond"} { + for _, svc := range []string{"nscd", "unscd", "systemd-logind", "cron", "crond"} { if err := restartService(svc); err != nil { logger.Errorf("Error restarting service: %v.", err) } } + // SSH should be explicitly started if not running. + for _, svc := range []string{"ssh", "sshd"} { + if err := startService(svc, true); err != nil { + logger.Errorf("Error restarting service: %v.", err) + } else { + // Stop on first matching, to avoid double restarting. + break + } + } + if enable { if err := createOSLoginDirs(); err != nil { logger.Errorf("Error creating OS Login directory: %v.", err) @@ -340,35 +350,28 @@ return sudoFile.Close() } -// restartService tries to restart a service on linux-like systems. It attempts -// to find and use the following mechanisms in order: -// 1. The `systemctl` utility, if in a systemd environment. -// 2. The `service` command, if present. -// 3. A SysVinit script directly, if present. -// Missing mechanisms and missing or disabled services are ignored. +// restartService tries to restart a systemd service if it is already running. func restartService(servicename string) error { - init, err := os.Readlink("/sbin/init") - if err == nil && strings.Contains(init, "systemd") { - if systemctl, err := exec.LookPath("systemctl"); err == nil { - if err := runCmd(exec.Command(systemctl, "is-active", servicename+".service")); err == nil { - return runCmd(exec.Command(systemctl, "restart", servicename+".service")) - } - return nil + if systemctl, err := exec.LookPath("systemctl"); err == nil { + if err := runCmd(exec.Command(systemctl, "is-active", servicename+".service")); err == nil { + return runCmd(exec.Command(systemctl, "restart", servicename+".service")) } } - service, err := exec.LookPath("service") - if err == nil { - if err := runCmd(exec.Command(service, servicename, "status")); err == nil { - return runCmd(exec.Command(service, servicename, "restart")) + + return nil +} + +// startService tries to start a systemd service. If the service is already +// running and restart is true, the service is restarted. +func startService(servicename string, restart bool) error { + if systemctl, err := exec.LookPath("systemctl"); err == nil { + started := nil == runCmd(exec.Command(systemctl, "is-active", servicename+".service")) + if !started { + return runCmd(exec.Command(systemctl, "start", servicename+".service")) } - return nil - } - initService := "/etc/init.d/" + servicename - if _, err := os.Stat(initService); err == nil { - if err := runCmd(exec.Command(initService, "status")); err == nil { - return runCmd(exec.Command(initService, "restart")) + if started && restart { + return runCmd(exec.Command(systemctl, "restart", servicename+".service")) } - return nil } return nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guest-agent-20210223.01/google_guest_agent/wsfc.go new/guest-agent-20210414.00/google_guest_agent/wsfc.go --- old/guest-agent-20210223.01/google_guest_agent/wsfc.go 2021-02-23 23:46:14.000000000 +0100 +++ new/guest-agent-20210414.00/google_guest_agent/wsfc.go 2021-04-15 00:44:12.000000000 +0200 @@ -203,7 +203,7 @@ // Read the incoming connection into the buffer. reqLen, err := conn.Read(buf) if err != nil { - logger.Errorf("wsfc - error on processing request: %s", err) + logger.Errorf("wsfc - error on processing tcp request for network heartbeat health check: %s", err) return } ++++++ vendor.tar.gz ++++++
