Hello community,
here is the log from the commit of package google-startup-scripts for
openSUSE:Factory checked in at 2016-02-25 22:09:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-02-05 00:32:19.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.google-startup-scripts.new/google-startup-scripts.changes
2016-02-26 00:31:45.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Feb 17 13:15:40 UTC 2016 - [email protected]
+
+- Add regenhostkey_usetmpdir.diff (bsc#965896)
+
+-------------------------------------------------------------------
+Fri Feb 12 23:55:16 UTC 2016 - [email protected]
+
+- Update to version 1.3.2 (bsc#966582, bsc#966583)
+ + Provide a shutdown service for systemd based systems to better
+ controll the order
+
+-------------------------------------------------------------------
Old:
----
google-startup-scripts-1.3.1.tar.bz2
New:
----
google-startup-scripts-1.3.2.tar.bz2
regenhostkey_usetmpdir.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-startup-scripts.spec ++++++
--- /var/tmp/diff_new_pack.7gjLlQ/_old 2016-02-26 00:31:46.000000000 +0100
+++ /var/tmp/diff_new_pack.7gjLlQ/_new 2016-02-26 00:31:46.000000000 +0100
@@ -17,7 +17,7 @@
Name: google-startup-scripts
-Version: 1.3.1
+Version: 1.3.2
Release: 0
Summary: GCE start up tools
License: Apache-2.0
@@ -27,6 +27,7 @@
Source1: google.suse
Source2: google-startup-scripts.suse
Patch0: google-startup-scripts_disable_console_log.diff
+Patch1: regenhostkey_usetmpdir.diff
%if 0%{?suse_version} > 1140
BuildRequires: systemd
%endif
@@ -46,6 +47,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p2
%build
@@ -57,11 +59,14 @@
cp -r usr/share %{buildroot}/usr
%if 0%{?suse_version} > 1140
%{__mkdir} -p %{buildroot}/%{_unitdir}
+ %{__mkdir} -p %{buildroot}/%{_unitdir}/../system-preset
%{__mkdir} -p %{buildroot}/%{_sbindir}
cp usr/lib/systemd/system/* %{buildroot}/%{_unitdir}
+ cp usr/lib/systemd/system-preset/*
%{buildroot}/%{_unitdir}/../system-preset
pushd %{buildroot}/%{_sbindir}
ln -s service rcgoogle
ln -s service rcgoogle-startup-scripts
+ ln -s service rcgoogle-shutdown-scripts
popd
%if 0%{?suse_version} > 1220
cp -r lib/udev %{buildroot}/usr/lib
@@ -86,6 +91,7 @@
%if 0%{?suse_version} > 1140
%service_del_preun google.service
%service_del_preun google-startup-scripts.service
+ %service_del_preun google-shutdown-scripts.service
%else
%stop_on_removal
%endif
@@ -94,18 +100,21 @@
%if 0%{?suse_version} > 1140
%service_add_pre google.service
%service_add_pre google-startup-scripts.service
+ %service_add_pre google-shutdown-scripts.service
%endif
%post
%if 0%{?suse_version} > 1140
%service_add_post google.service
%service_add_post google-startup-scripts.service
+ %service_add_post google-shutdown-scripts.service
%endif
%postun
%if 0%{?suse_version} > 1140
%service_del_postun google.service
%service_del_postun google-startup-scripts.service
+ %service_del_postun google-shutdown-scripts.service
%else
%insserv_cleanup
%endif
@@ -120,8 +129,11 @@
%dir %{_datadir}/google/boto
%dir /etc/rsyslog.d
%if 0%{?suse_version} > 1140
+%{_sbindir}/rcgoogle-shutdown-scripts
%{_unitdir}/google.service
%{_unitdir}/google-startup-scripts.service
+%{_unitdir}/google-shutdown-scripts.service
+%{_unitdir}/../system-preset/50-google.preset
%else
%attr(0755,root,root) %{_initrddir}/google
%attr(0755,root,root) %{_initrddir}/google-startup-scripts
++++++ google-startup-scripts-1.3.1.tar.bz2 ->
google-startup-scripts-1.3.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/google-startup-scripts-1.3.1/usr/lib/systemd/system/google-shutdown-scripts.service
new/google-startup-scripts-1.3.2/usr/lib/systemd/system/google-shutdown-scripts.service
---
old/google-startup-scripts-1.3.1/usr/lib/systemd/system/google-shutdown-scripts.service
1970-01-01 01:00:00.000000000 +0100
+++
new/google-startup-scripts-1.3.2/usr/lib/systemd/system/google-shutdown-scripts.service
2016-02-12 04:14:44.000000000 +0100
@@ -0,0 +1,15 @@
+[Unit]
+Description=Google Compute Engine user shutdown scripts
+After=local-fs.target network-online.target network.target
+After=google.service rsyslog.service
+Wants=local-fs.target network-online.target network.target
+
+[Service]
+ExecStart=/bin/true
+ExecStop=/usr/share/google/run-shutdown-scripts
+Type=oneshot
+RemainAfterExit=true
+TimeoutStopSec=0
+
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/google-startup-scripts-1.3.1/usr/lib/systemd/system/google-startup-scripts.service
new/google-startup-scripts-1.3.2/usr/lib/systemd/system/google-startup-scripts.service
---
old/google-startup-scripts-1.3.1/usr/lib/systemd/system/google-startup-scripts.service
2016-01-20 19:41:29.000000000 +0100
+++
new/google-startup-scripts-1.3.2/usr/lib/systemd/system/google-startup-scripts.service
2016-02-12 04:14:44.000000000 +0100
@@ -1,15 +1,12 @@
[Unit]
-Description=Google Compute Engine user scripts
+Description=Google Compute Engine user startup scripts
After=local-fs.target network-online.target network.target
After=google.service rsyslog.service
Wants=local-fs.target network-online.target network.target
[Service]
ExecStart=/usr/share/google/run-startup-scripts
-ExecStop=/usr/share/google/run-shutdown-scripts
Type=oneshot
-RemainAfterExit=true
-TimeoutStopSec=0
[Install]
WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/google-startup-scripts-1.3.1/usr/lib/systemd/system-preset/50-google.preset
new/google-startup-scripts-1.3.2/usr/lib/systemd/system-preset/50-google.preset
---
old/google-startup-scripts-1.3.1/usr/lib/systemd/system-preset/50-google.preset
2016-01-20 19:41:29.000000000 +0100
+++
new/google-startup-scripts-1.3.2/usr/lib/systemd/system-preset/50-google.preset
2016-02-12 04:14:44.000000000 +0100
@@ -1,2 +1,3 @@
-enable google-startup-scripts.service
enable google.service
+enable google-shutdown-scripts.service
+enable google-startup-scripts.service
++++++ regenhostkey_usetmpdir.diff ++++++
diff --git a/google-startup-scripts/usr/share/google/regenerate-host-keys
b/google-startup-scripts/usr/share/google/regenerate-host-keys
index bc6bf2d..fb9d7fd 100755
--- a/google-startup-scripts/usr/share/google/regenerate-host-keys
+++ b/google-startup-scripts/usr/share/google/regenerate-host-keys
@@ -37,7 +37,8 @@ sshd_cmd() {
generate_key() {
local key_type=$1
local key_dest=$2
- local tmp_file="/tmp/keyfile.$$";
+ local tmp_dir=$(mktemp -d /tmp/keystore.XXXXXXXX)
+ local tmp_file="/${tmp_dir}/keyfile.$$";
local log_file=$(mktemp);
log "Regenerating sshd key ${key_dest}"
ssh-keygen -N '' -t ${key_type} -f ${tmp_file} > ${log_file} 2>&1
@@ -49,7 +50,7 @@ generate_key() {
log "Could not create sshd key ${key_dest}"
log "$(cat ${log_file})"
fi
- rm -f ${tmp_file}
+ rm -rf ${tmp_dir}
rm -f ${log_file}
}
