Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2014-07-27 08:25:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2014-07-19 11:05:27.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2014-07-27 08:25:58.000000000 +0200
@@ -1,0 +2,29 @@
+Thu Jul 24 14:42:59 UTC 2014 - [email protected]
+
+- do not repeat release notes downloading on network time out
+ (bnc#885486)
+- 3.1.105
+
+-------------------------------------------------------------------
+Thu Jul 24 11:52:43 CEST 2014 - [email protected]
+
+- do not log sensitive information in y2start.log (bnc#888645)
+- 3.1.104
+
+-------------------------------------------------------------------
+Tue Jul 22 08:13:41 CEST 2014 - [email protected]
+
+- linuxrc already provides proxy settings in URL form - so use it
+- 3.1.103
+
+-------------------------------------------------------------------
+Mon Jul 21 12:10:43 CEST 2014 - [email protected]
+
+- taking display-manager.service instead of xdm.service in the
+ second boot stage (bnc#886654, 884447)
+- Workaround of bug in plymouth --> using deactivate option
+ in second boot stage in order to start ncurses yast correctly
+ (bnc#886488)
+- 3.1.102
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.101.tar.bz2
New:
----
yast2-installation-3.1.105.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.FSTnI3/_old 2014-07-27 08:25:59.000000000 +0200
+++ /var/tmp/diff_new_pack.FSTnI3/_new 2014-07-27 08:25:59.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.101
+Version: 3.1.105
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ YaST2-Firstboot.service ++++++
--- /var/tmp/diff_new_pack.FSTnI3/_old 2014-07-27 08:25:59.000000000 +0200
+++ /var/tmp/diff_new_pack.FSTnI3/_new 2014-07-27 08:25:59.000000000 +0200
@@ -1,7 +1,7 @@
[Unit]
Description=YaST2 Firstboot
After=apparmor.service local-fs.target YaST2-Second-Stage.service
plymouth-start.service
[email protected] xdm.service network.service NetworkManager.service
[email protected] display-manager.service network.service
NetworkManager.service
ConditionPathExists=/var/lib/YaST2/reconfig_system
[Service]
++++++ YaST2-Second-Stage.service ++++++
--- /var/tmp/diff_new_pack.FSTnI3/_old 2014-07-27 08:25:59.000000000 +0200
+++ /var/tmp/diff_new_pack.FSTnI3/_new 2014-07-27 08:25:59.000000000 +0200
@@ -1,13 +1,16 @@
[Unit]
Description=YaST2 Second Stage
After=apparmor.service local-fs.target plymouth-start.service
[email protected] xdm.service network.service NetworkManager.service
SuSEfirewall2_init.service SuSEfirewall2.service
[email protected] display-manager.service network.service
NetworkManager.service SuSEfirewall2_init.service SuSEfirewall2.service
ConditionPathExists=/var/lib/YaST2/runme_at_boot
[Service]
Type=oneshot
Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
-ExecStartPre=-/usr/bin/plymouth --hide-splash
+# Workaround of bug in plymouth --> using deactivate option
+# in second boot stage in order to start ncurses yast correctly
+# (bnc#886488)
+ExecStartPre=-/usr/bin/plymouth deactivate --hide-splash
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes
TimeoutSec=0
++++++ yast2-installation-3.1.101.tar.bz2 -> yast2-installation-3.1.105.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.101/package/YaST2-Firstboot.service
new/yast2-installation-3.1.105/package/YaST2-Firstboot.service
--- old/yast2-installation-3.1.101/package/YaST2-Firstboot.service
2014-07-17 10:44:52.000000000 +0200
+++ new/yast2-installation-3.1.105/package/YaST2-Firstboot.service
2014-07-24 17:10:08.000000000 +0200
@@ -1,7 +1,7 @@
[Unit]
Description=YaST2 Firstboot
After=apparmor.service local-fs.target YaST2-Second-Stage.service
plymouth-start.service
[email protected] xdm.service network.service NetworkManager.service
[email protected] display-manager.service network.service
NetworkManager.service
ConditionPathExists=/var/lib/YaST2/reconfig_system
[Service]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.101/package/YaST2-Second-Stage.service
new/yast2-installation-3.1.105/package/YaST2-Second-Stage.service
--- old/yast2-installation-3.1.101/package/YaST2-Second-Stage.service
2014-07-17 10:44:52.000000000 +0200
+++ new/yast2-installation-3.1.105/package/YaST2-Second-Stage.service
2014-07-24 17:10:08.000000000 +0200
@@ -1,13 +1,16 @@
[Unit]
Description=YaST2 Second Stage
After=apparmor.service local-fs.target plymouth-start.service
[email protected] xdm.service network.service NetworkManager.service
SuSEfirewall2_init.service SuSEfirewall2.service
[email protected] display-manager.service network.service
NetworkManager.service SuSEfirewall2_init.service SuSEfirewall2.service
ConditionPathExists=/var/lib/YaST2/runme_at_boot
[Service]
Type=oneshot
Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
-ExecStartPre=-/usr/bin/plymouth --hide-splash
+# Workaround of bug in plymouth --> using deactivate option
+# in second boot stage in order to start ncurses yast correctly
+# (bnc#886488)
+ExecStartPre=-/usr/bin/plymouth deactivate --hide-splash
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes
TimeoutSec=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.101/package/yast2-installation.changes
new/yast2-installation-3.1.105/package/yast2-installation.changes
--- old/yast2-installation-3.1.101/package/yast2-installation.changes
2014-07-17 10:44:52.000000000 +0200
+++ new/yast2-installation-3.1.105/package/yast2-installation.changes
2014-07-24 17:10:08.000000000 +0200
@@ -1,4 +1,33 @@
-------------------------------------------------------------------
+Thu Jul 24 14:42:59 UTC 2014 - [email protected]
+
+- do not repeat release notes downloading on network time out
+ (bnc#885486)
+- 3.1.105
+
+-------------------------------------------------------------------
+Thu Jul 24 11:52:43 CEST 2014 - [email protected]
+
+- do not log sensitive information in y2start.log (bnc#888645)
+- 3.1.104
+
+-------------------------------------------------------------------
+Tue Jul 22 08:13:41 CEST 2014 - [email protected]
+
+- linuxrc already provides proxy settings in URL form - so use it
+- 3.1.103
+
+-------------------------------------------------------------------
+Mon Jul 21 12:10:43 CEST 2014 - [email protected]
+
+- taking display-manager.service instead of xdm.service in the
+ second boot stage (bnc#886654, 884447)
+- Workaround of bug in plymouth --> using deactivate option
+ in second boot stage in order to start ncurses yast correctly
+ (bnc#886488)
+- 3.1.102
+
+-------------------------------------------------------------------
Wed Jul 16 09:15:10 UTC 2014 - [email protected]
- retranslate release notes button when going back in workflow
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.101/package/yast2-installation.spec
new/yast2-installation-3.1.105/package/yast2-installation.spec
--- old/yast2-installation-3.1.101/package/yast2-installation.spec
2014-07-17 10:44:52.000000000 +0200
+++ new/yast2-installation-3.1.105/package/yast2-installation.spec
2014-07-24 17:10:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.101
+Version: 3.1.105
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.101/src/clients/inst_download_release_notes.rb
new/yast2-installation-3.1.105/src/clients/inst_download_release_notes.rb
--- old/yast2-installation-3.1.101/src/clients/inst_download_release_notes.rb
2014-07-17 10:44:52.000000000 +0200
+++ new/yast2-installation-3.1.105/src/clients/inst_download_release_notes.rb
2014-07-24 17:10:08.000000000 +0200
@@ -116,6 +116,7 @@
String.Quote(Directory.logdir),
"curl_log"
)
+ # TODO: wrap in a Popup.Feedback call, it can take long time
ret = SCR.Execute(path(".target.bash"), cmd)
log.info("Downloading release notes: #{cmd} returned #{ret}")
if ret == 0
@@ -123,7 +124,10 @@
InstData.release_notes[product["name"]] =
SCR.Read(path(".target.string"), filename)
InstData.downloaded_release_notes << product["name"]
break
- elsif ret == 7
+ # exit codes (see "man curl"):
+ # 7 = Failed to connect to host.
+ # 28 = Operation timeout.
+ elsif ret == 7 || ret == 28
log.info "Communication with server for release notes download
failed, skipping further attempts."
InstData.stop_relnotes_download = true
break
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.101/src/clients/proxy_finish.rb
new/yast2-installation-3.1.105/src/clients/proxy_finish.rb
--- old/yast2-installation-3.1.101/src/clients/proxy_finish.rb 2014-07-17
10:44:52.000000000 +0200
+++ new/yast2-installation-3.1.105/src/clients/proxy_finish.rb 2014-07-24
17:10:08.000000000 +0200
@@ -65,28 +65,14 @@
}
elsif @func == "Write"
if Stage.initial
- @proxy = Convert.to_string(SCR.Read(path(".etc.install_inf.Proxy")))
- @proxyport = Convert.to_string(
- SCR.Read(path(".etc.install_inf.ProxyPort"))
- )
- @proxyproto = Convert.to_string(
- SCR.Read(path(".etc.install_inf.ProxyProto"))
- )
+ @proxy =
Convert.to_string(SCR.Read(path(".etc.install_inf.ProxyURL")))
- if @proxy != nil && @proxyport != nil && @proxyproto != nil
- @fullproxy = Ops.add(
- Ops.add(
- Ops.add(Ops.add(Ops.add(@proxyproto, "://"), @proxy), ":"),
- @proxyport
- ),
- "/"
- )
-
- Builtins.y2milestone("setting proxy to %1", @fullproxy)
+ if @proxy != nil
+ Builtins.y2milestone("setting proxy to %1", @proxy)
# maybe use Proxy module
- SCR.Write(path(".sysconfig.proxy.HTTP_PROXY"), @fullproxy)
- SCR.Write(path(".sysconfig.proxy.FTP_PROXY"), @fullproxy)
+ SCR.Write(path(".sysconfig.proxy.HTTP_PROXY"), @proxy)
+ SCR.Write(path(".sysconfig.proxy.FTP_PROXY"), @proxy)
SCR.Write(path(".sysconfig.proxy"), nil)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.101/startup/YaST2.First-Stage
new/yast2-installation-3.1.105/startup/YaST2.First-Stage
--- old/yast2-installation-3.1.101/startup/YaST2.First-Stage 2014-07-17
10:44:53.000000000 +0200
+++ new/yast2-installation-3.1.105/startup/YaST2.First-Stage 2014-07-24
17:10:08.000000000 +0200
@@ -72,14 +72,7 @@
rm -f /var/log/YaST2/y2start.log
log "YaST2 startup level (1)..."
log "=========================="
-IFS_SAVE=$IFS
-IFS="
-"
-for i in `export`;do
- i=${i//Password*/Password=\"<your-password>\"}
- log "\t$i"
-done
-IFS=$IFS_SAVE
+log_export
#=============================================
# 1.5) call preFirstStage hooks...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.101/startup/YaST2.Second-Stage
new/yast2-installation-3.1.105/startup/YaST2.Second-Stage
--- old/yast2-installation-3.1.101/startup/YaST2.Second-Stage 2014-07-17
10:44:53.000000000 +0200
+++ new/yast2-installation-3.1.105/startup/YaST2.Second-Stage 2014-07-24
17:10:08.000000000 +0200
@@ -96,14 +96,7 @@
LOG_PREFIX="Stage [2]"
log "YaST2 startup level (2)..."
log "=========================="
-IFS_SAVE=$IFS
-IFS="
-"
-for i in `export`;do
- i=${i//Password*/Password=\"<your-password>\"}
- log "\t$i"
-done
-IFS=$IFS_SAVE
+log_export
#=============================================
# 1.6) call preSecondStage hook scripts...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.101/startup/common/misc.sh
new/yast2-installation-3.1.105/startup/common/misc.sh
--- old/yast2-installation-3.1.101/startup/common/misc.sh 2014-07-17
10:44:53.000000000 +0200
+++ new/yast2-installation-3.1.105/startup/common/misc.sh 2014-07-24
17:10:08.000000000 +0200
@@ -22,15 +22,9 @@
# If Proxy: is set in install.inf export the env
# variables for http_proxy and ftp_proxy
# ---
- if [ -f /etc/install.inf ];then
- if grep -qs '^Proxy:.*' /etc/install.inf ; then
- Proxy=$(awk ' /^Proxy:/ { print $2 }' < /etc/install.inf)
- ProxyPort=$(awk ' /^ProxyPort:/ { print $2 }' <
/etc/install.inf)
- ProxyProto=$(awk ' /^ProxyProto:/ { print $2 }' <
/etc/install.inf)
- FullProxy="${ProxyProto}://${Proxy}:${ProxyPort}/"
- export http_proxy=$FullProxy
- export ftp_proxy=$FullProxy
- fi
+ if [ "$ProxyURL" ] ; then
+ export http_proxy="$ProxyURL"
+ export ftp_proxy="$ProxyURL"
fi
}
@@ -226,3 +220,17 @@
grep -qw TERM /proc/cmdline && return 0 || return 1
}
+
+function log_export()
+{
+ IFS_SAVE=$IFS
+ IFS="
+"
+ for i in `export` ; do
+ i=${i//Password=*/Password=\"<Password> (sensitive information)\"}
+ i=${i//RepoURL=*/RepoURL=\"<RepoURL (may contain sensitive
information)>\"}
+ i=${i//ZyppRepoURL=*/ZyppRepoURL=\"<ZyppRepoURL (may contain sensitive
information)>\"}
+ log "\t$i"
+ done
+ IFS=$IFS_SAVE
+}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
