Hello community,
here is the log from the commit of package google-startup-scripts for
openSUSE:Factory checked in at 2015-08-03 17:22:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-startup-scripts (Old)
and /work/SRC/openSUSE:Factory/.google-startup-scripts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-startup-scripts"
Changes:
--------
---
/work/SRC/openSUSE:Factory/google-startup-scripts/google-startup-scripts.changes
2015-03-19 21:15:13.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.google-startup-scripts.new/google-startup-scripts.changes
2015-08-03 17:22:39.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Aug 3 08:15:42 UTC 2015 - [email protected]
+
+- Update to version 1.2.7 (bnc#940190)
+ + Add systemd support for restarting SSH after key generation.
+ + Update safe_format_and_mount
+- google-startup-scripts_disable_console_log.diff: Removed rsyslogd
+ configuration that sends kernel and other messages to console
+ (bnc#939272)
+
+-------------------------------------------------------------------
Old:
----
google-startup-scripts-1.2.4.tar.bz2
New:
----
google-startup-scripts-1.2.7.tar.bz2
google-startup-scripts_disable_console_log.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-startup-scripts.spec ++++++
--- /var/tmp/diff_new_pack.9lNcV4/_old 2015-08-03 17:22:40.000000000 +0200
+++ /var/tmp/diff_new_pack.9lNcV4/_new 2015-08-03 17:22:40.000000000 +0200
@@ -17,7 +17,7 @@
Name: google-startup-scripts
-Version: 1.2.4
+Version: 1.2.7
Release: 0
Summary: GCE start up tools
License: Apache-2.0
@@ -26,6 +26,7 @@
Source0: %{name}-%{version}.tar.bz2
Source1: google.suse
Source2: google-startup-scripts.suse
+Patch0: google-startup-scripts_disable_console_log.diff
%if 0%{?suse_version} > 1140
BuildRequires: systemd
%endif
@@ -44,6 +45,7 @@
%prep
%setup -q
+%patch0 -p1
%build
++++++ google-startup-scripts-1.2.4.tar.bz2 ->
google-startup-scripts-1.2.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/google-startup-scripts-1.2.4/README.md
new/google-startup-scripts-1.2.7/README.md
--- old/google-startup-scripts-1.2.4/README.md 2015-03-10 02:28:44.000000000
+0100
+++ new/google-startup-scripts-1.2.7/README.md 2015-07-11 02:13:30.000000000
+0200
@@ -1,5 +1,5 @@
## Google Startup Scripts
-Google provides a set of startup scripts that interact with the virtual
machine environment. On boot, the startup script `/usr/share/google/onboot`
queries the instance metadata for a user-provided startup script to run.
User-provided startup scripts can be specified in the instance metadata under
`startup-script` or, if the metadata is in a small script or a downloadable
file, it can be specified `via startup-script-url`. You can use gcutil or the
[Google Compute Engine
API](https://developers.google.com/compute/docs/reference/latest) to specify a
startup script.
+Google provides a set of startup scripts that interact with the virtual
machine environment. On boot, the startup script `/usr/share/google/onboot`
queries the instance metadata for a user-provided startup script to run.
User-provided startup scripts can be specified in the instance metadata under
`startup-script` or, if the metadata is in a small script or a downloadable
file, it can be specified `via startup-script-url`. You can use [gcloud
compute](https://cloud.google.com/compute/docs/gcloud-compute/) or the [Google
Compute Engine
API](https://developers.google.com/compute/docs/reference/latest) to specify a
startup script.
For more information on how to use startup scripts, read the [Using Start Up
Scripts
documentation](https://developers.google.com/compute/docs/howtos/startupscript#storescriptremotely).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/google-startup-scripts-1.2.4/usr/lib/systemd/system/google.service
new/google-startup-scripts-1.2.7/usr/lib/systemd/system/google.service
--- old/google-startup-scripts-1.2.4/usr/lib/systemd/system/google.service
2015-03-10 02:28:44.000000000 +0100
+++ new/google-startup-scripts-1.2.7/usr/lib/systemd/system/google.service
2015-07-11 02:13:30.000000000 +0200
@@ -9,4 +9,5 @@
Type=oneshot
[Install]
+WantedBy=sshd.service
WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/google-startup-scripts-1.2.4/usr/share/google/regenerate-host-keys
new/google-startup-scripts-1.2.7/usr/share/google/regenerate-host-keys
--- old/google-startup-scripts-1.2.4/usr/share/google/regenerate-host-keys
2015-03-10 02:28:44.000000000 +0100
+++ new/google-startup-scripts-1.2.7/usr/share/google/regenerate-host-keys
2015-07-11 02:13:30.000000000 +0200
@@ -67,10 +67,14 @@
if [[ $(cat /etc/ssh/sshd_not_to_be_run 2>/dev/null) == "GOOGLE" ]]; then
rm -f /etc/ssh/sshd_not_to_be_run
fi
- # Start sshd if it was not running.
- sshd_cmd start
- # Reload sshd config if it already was running.
- sshd_cmd reload
+ if [[ -x /bin/systemctl ]]; then
+ exit
+ else
+ # Start sshd if it was not running.
+ sshd_cmd start
+ # Reload sshd config if it already was running.
+ sshd_cmd reload
+ fi
}
regenerate_host_keys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/google-startup-scripts-1.2.4/usr/share/google/safe_format_and_mount
new/google-startup-scripts-1.2.7/usr/share/google/safe_format_and_mount
--- old/google-startup-scripts-1.2.4/usr/share/google/safe_format_and_mount
2015-03-10 02:28:44.000000000 +0100
+++ new/google-startup-scripts-1.2.7/usr/share/google/safe_format_and_mount
2015-07-11 02:13:30.000000000 +0200
@@ -23,12 +23,14 @@
FSCK=fsck.ext4
MOUNT_OPTIONS="discard,defaults"
MKFS="mkfs.ext4 -E lazy_itable_init=0,lazy_journal_init=0 -F"
-if grep -q '6\..' /etc/redhat-release; then
- # lazy_journal_init is not recognized in redhat 6
- MKFS="mkfs.ext4 -E lazy_itable_init=0 -F"
-elif grep -q '7\..' /etc/redhat-release; then
- FSCK=fsck.xfs
- MKFS=mkfs.xfs
+if [ -f /etc/redhat-release ]; then
+ if grep -q '6\..' /etc/redhat-release; then
+ # lazy_journal_init is not recognized in redhat 6
+ MKFS="mkfs.ext4 -E lazy_itable_init=0 -F"
+ elif grep -q '7\..' /etc/redhat-release; then
+ FSCK=fsck.xfs
+ MKFS=mkfs.xfs
+ fi
fi
LOGTAG=safe_format_and_mount
++++++ google-startup-scripts_disable_console_log.diff ++++++
Index: google-startup-scripts-1.2.7/etc/rsyslog.d/90-google.conf
===================================================================
--- google-startup-scripts-1.2.7.orig/etc/rsyslog.d/90-google.conf
2015-07-11 02:13:30.000000000 +0200
+++ google-startup-scripts-1.2.7/etc/rsyslog.d/90-google.conf 2015-07-31
15:42:31.467392994 +0200
@@ -1,7 +1,3 @@
-# Google Compute Engine default console logging.
-#
-auth,daemon,kern.* /dev/console
-
# Dump startup script output to /var/log/startupscript.log.
:syslogtag,startswith,"startupscript" /var/log/startupscript.log
