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-06-23 17:38:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-guest-agent (Old)
and /work/SRC/openSUSE:Factory/.google-guest-agent.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-guest-agent"
Wed Jun 23 17:38:31 2021 rev:5 rq:901480 version:20210603.00
Changes:
--------
--- /work/SRC/openSUSE:Factory/google-guest-agent/google-guest-agent.changes
2021-05-12 19:33:33.838718413 +0200
+++
/work/SRC/openSUSE:Factory/.google-guest-agent.new.2625/google-guest-agent.changes
2021-06-23 17:38:44.972514215 +0200
@@ -1,0 +2,11 @@
+Wed Jun 23 11:25:59 UTC 2021 - John Paul Adrian Glaubitz
<adrian.glaub...@suse.com>
+
+- Update to version 20210603.00
+ * systemd-notify in agentInit (#113)
+ * dont check status (#112)
+- from version 20210524.00
+ * more granular service restarts (#111)
+- from version 20210414.00
+ * (no functional changes)
+
+-------------------------------------------------------------------
Old:
----
guest-agent-20210414.00.tar.gz
New:
----
guest-agent-20210603.00.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-guest-agent.spec ++++++
--- /var/tmp/diff_new_pack.tIPMIS/_old 2021-06-23 17:38:45.724515250 +0200
+++ /var/tmp/diff_new_pack.tIPMIS/_new 2021-06-23 17:38:45.728515255 +0200
@@ -24,7 +24,7 @@
%global import_path %{provider_prefix}
Name: google-guest-agent
-Version: 20210414.00
+Version: 20210603.00
Release: 0
Summary: Google Cloud Guest Agent
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.tIPMIS/_old 2021-06-23 17:38:45.764515305 +0200
+++ /var/tmp/diff_new_pack.tIPMIS/_new 2021-06-23 17:38:45.764515305 +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">20210414.00</param>
- <param name="revision">20210414.00</param>
+ <param name="versionformat">20210603.00</param>
+ <param name="revision">20210603.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-20210414.00.tar.gz</param>
+ <param name="archive">guest-agent-20210603.00.tar.gz</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.tIPMIS/_old 2021-06-23 17:38:45.784515333 +0200
+++ /var/tmp/diff_new_pack.tIPMIS/_new 2021-06-23 17:38:45.784515333 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/GoogleCloudPlatform/guest-agent/</param>
- <param
name="changesrevision">cfc05e2e8fbbf36ae22544299257318f65162b27</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">0fa77033ed846e5bf40f41d299203f88ecdad730</param></service></servicedata>
\ No newline at end of file
++++++ guest-agent-20210414.00.tar.gz -> guest-agent-20210603.00.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/guest-agent-20210414.00/google-guest-agent.service
new/guest-agent-20210603.00/google-guest-agent.service
--- old/guest-agent-20210414.00/google-guest-agent.service 2021-04-15
00:44:12.000000000 +0200
+++ new/guest-agent-20210603.00/google-guest-agent.service 2021-06-04
01:33:36.000000000 +0200
@@ -13,7 +13,7 @@
PartOf=network.service networking.service NetworkManager.service
systemd-networkd.service
[Service]
-Type=simple
+Type=notify
ExecStart=/usr/bin/google_guest_agent
OOMScoreAdjust=-999
Restart=always
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20210414.00/google_guest_agent/instance_setup.go
new/guest-agent-20210603.00/google_guest_agent/instance_setup.go
--- old/guest-agent-20210414.00/google_guest_agent/instance_setup.go
2021-04-15 00:44:12.000000000 +0200
+++ new/guest-agent-20210603.00/google_guest_agent/instance_setup.go
2021-06-04 01:33:36.000000000 +0200
@@ -104,6 +104,7 @@
}
} else {
// Linux instance setup.
+ defer runCmd(exec.Command("systemd-notify", "--ready"))
if config.Section("Snapshots").Key("enabled").MustBool(false) {
logger.Infof("Snapshot listener enabled")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20210414.00/google_guest_agent/non_windows_accounts.go
new/guest-agent-20210603.00/google_guest_agent/non_windows_accounts.go
--- old/guest-agent-20210414.00/google_guest_agent/non_windows_accounts.go
2021-04-15 00:44:12.000000000 +0200
+++ new/guest-agent-20210603.00/google_guest_agent/non_windows_accounts.go
2021-06-04 01:33:36.000000000 +0200
@@ -184,7 +184,7 @@
// 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)
+ systemctlStart(svc)
}
return nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/guest-agent-20210414.00/google_guest_agent/oslogin.go
new/guest-agent-20210603.00/google_guest_agent/oslogin.go
--- old/guest-agent-20210414.00/google_guest_agent/oslogin.go 2021-04-15
00:44:12.000000000 +0200
+++ new/guest-agent-20210603.00/google_guest_agent/oslogin.go 2021-06-04
01:33:36.000000000 +0200
@@ -104,18 +104,16 @@
}
for _, svc := range []string{"nscd", "unscd", "systemd-logind", "cron",
"crond"} {
- if err := restartService(svc); err != nil {
+ // These services should be restarted if running
+ if err := systemctlTryRestart(svc); err != nil {
logger.Errorf("Error restarting service: %v.", err)
}
}
- // SSH should be explicitly started if not running.
+ // SSH should be started if not running, reloaded otherwise.
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 err := systemctlReloadOrRestart(svc); err != nil {
+ logger.Errorf("Error reloading service: %v.", err)
}
}
@@ -350,29 +348,20 @@
return sudoFile.Close()
}
-// restartService tries to restart a systemd service if it is already running.
-func restartService(servicename string) error {
- 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
-}
-
-// 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"))
- }
- if started && restart {
- return runCmd(exec.Command(systemctl, "restart",
servicename+".service"))
- }
- }
-
- return nil
+// systemctlTryRestart tries to restart a systemd service if it is already
+// running. Stopped services will be ignored.
+func systemctlTryRestart(servicename string) error {
+ return runCmd(exec.Command("systemctl", "try-restart",
servicename+".service"))
+}
+
+// systemctlReloadOrRestart tries to reload a running systemd service if
+// supported, restart otherwise. Stopped services will be started.
+func systemctlReloadOrRestart(servicename string) error {
+ return runCmd(exec.Command("systemctl", "reload-or-restart",
servicename+".service"))
+}
+
+// systemctlStart tries to start a stopped systemd service. Started services
+// will be ignored.
+func systemctlStart(servicename string) error {
+ return runCmd(exec.Command("systemctl", "start",
servicename+".service"))
}
++++++ vendor.tar.gz ++++++
