Hello community,
here is the log from the commit of package yast2-installation for openSUSE:12.1
checked in at 2011-11-07 14:35:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/yast2-installation (Old)
and /work/SRC/openSUSE:12.1/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation", Maintainer is "jsuch...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1/yast2-installation/yast2-installation.changes
2011-10-24 13:37:45.000000000 +0200
+++ /work/SRC/openSUSE:12.1/.yast2-installation.new/yast2-installation.changes
2011-11-07 14:35:27.000000000 +0100
@@ -1,0 +2,20 @@
+Thu Nov 03 11:52:08 CET 2011 - aschn...@suse.de
+
+- use same code to display ip addresses during vnc and ssh
+ installation (bnc#727802)
+- 2.21.28
+
+-------------------------------------------------------------------
+Wed Nov 2 17:14:51 CET 2011 - fcro...@suse.com
+
+- Ensure network is not started by systemd before Firstboot /
+ SecondStage (bnc#726823)
+- 2.21.27
+
+-------------------------------------------------------------------
+Mon Oct 31 09:18:46 CET 2011 - jsuch...@suse.cz
+
+- control files: save ecdsa keys (bnc#726468)
+- 2.21.26
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.21.25.tar.bz2
New:
----
yast2-installation-2.21.28.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.LShzg5/_old 2011-11-07 14:35:27.000000000 +0100
+++ /var/tmp/diff_new_pack.LShzg5/_new 2011-11-07 14:35:27.000000000 +0100
@@ -19,7 +19,7 @@
Name: yast2-installation
-Version: 2.21.25
+Version: 2.21.28
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ YaST2-Firstboot.service ++++++
--- /var/tmp/diff_new_pack.LShzg5/_old 2011-11-07 14:35:27.000000000 +0100
+++ /var/tmp/diff_new_pack.LShzg5/_new 2011-11-07 14:35:27.000000000 +0100
@@ -1,7 +1,7 @@
[Unit]
Description=YaST2 Firstboot
After=apparmor.service local-fs.target YaST2-Second-Stage.service
-Before=getty@tty1.service xdm.service
+Before=getty@tty1.service xdm.service network.service NetworkManager.service
ConditionPathExists=/var/lib/YaST2/reconfig_system
[Service]
++++++ YaST2-Second-Stage.service ++++++
--- /var/tmp/diff_new_pack.LShzg5/_old 2011-11-07 14:35:27.000000000 +0100
+++ /var/tmp/diff_new_pack.LShzg5/_new 2011-11-07 14:35:27.000000000 +0100
@@ -1,7 +1,7 @@
[Unit]
Description=YaST2 Second Stage
After=apparmor.service local-fs.target
-Before=getty@tty1.service xdm.service
+Before=getty@tty1.service xdm.service network.service NetworkManager.service
ConditionPathExists=/var/lib/YaST2/runme_at_boot
[Service]
++++++ yast2-installation-2.21.25.tar.bz2 -> yast2-installation-2.21.28.tar.bz2
++++++
++++ 13505 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.21.25/Makefile.am
new/yast2-installation-2.21.28/Makefile.am
--- old/yast2-installation-2.21.25/Makefile.am 2011-10-19 16:30:15.000000000
+0200
+++ new/yast2-installation-2.21.28/Makefile.am 2011-10-11 09:07:05.000000000
+0200
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.21.25/VERSION new/yast2-installation-2.21.28/VERSION
--- old/yast2-installation-2.21.25/VERSION 2011-10-19 16:27:53.000000000
+0200
+++ new/yast2-installation-2.21.28/VERSION 2011-11-06 18:00:37.000000000
+0100
@@ -1 +1 @@
-2.21.25
+2.21.28
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.21.25/configure.in
new/yast2-installation-2.21.28/configure.in
--- old/yast2-installation-2.21.25/configure.in 2011-10-19 16:30:15.000000000
+0200
+++ new/yast2-installation-2.21.28/configure.in 2011-10-11 09:07:05.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.21.25, http://bugs.opensuse.org/,
yast2-installation)
+AC_INIT(yast2-installation, 2.21.23, http://bugs.opensuse.org/,
yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.21.25"
+VERSION="2.21.23"
RPMNAME="yast2-installation"
MAINTAINER="Jiří Suchomel <jsuch...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.21.25/control/control.SLED.xml
new/yast2-installation-2.21.28/control/control.SLED.xml
--- old/yast2-installation-2.21.25/control/control.SLED.xml 2011-10-19
12:18:29.000000000 +0200
+++ new/yast2-installation-2.21.28/control/control.SLED.xml 2011-10-27
15:29:03.000000000 +0200
@@ -65,6 +65,8 @@
<file_item>/etc/ssh/ssh_host_dsa_key.pub</file_item>
<file_item>/etc/ssh/ssh_host_rsa_key</file_item>
<file_item>/etc/ssh/ssh_host_rsa_key.pub</file_item>
+ <file_item>/etc/ssh/ssh_host_ecdsa_key</file_item>
+ <file_item>/etc/ssh/ssh_host_ecdsa_key.pub</file_item>
</optional_files>
</copy_to_system_item>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.21.25/control/control.SLES.xml
new/yast2-installation-2.21.28/control/control.SLES.xml
--- old/yast2-installation-2.21.25/control/control.SLES.xml 2011-10-19
12:18:29.000000000 +0200
+++ new/yast2-installation-2.21.28/control/control.SLES.xml 2011-10-27
15:27:59.000000000 +0200
@@ -62,6 +62,8 @@
<file_item>/etc/ssh/ssh_host_dsa_key.pub</file_item>
<file_item>/etc/ssh/ssh_host_rsa_key</file_item>
<file_item>/etc/ssh/ssh_host_rsa_key.pub</file_item>
+ <file_item>/etc/ssh/ssh_host_ecdsa_key</file_item>
+ <file_item>/etc/ssh/ssh_host_ecdsa_key.pub</file_item>
</optional_files>
</copy_to_system_item>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.21.25/control/control.openSUSE.xml
new/yast2-installation-2.21.28/control/control.openSUSE.xml
--- old/yast2-installation-2.21.25/control/control.openSUSE.xml 2011-10-19
12:18:29.000000000 +0200
+++ new/yast2-installation-2.21.28/control/control.openSUSE.xml 2011-10-27
15:27:48.000000000 +0200
@@ -68,6 +68,8 @@
<file_item>/etc/ssh/ssh_host_dsa_key.pub</file_item>
<file_item>/etc/ssh/ssh_host_rsa_key</file_item>
<file_item>/etc/ssh/ssh_host_rsa_key.pub</file_item>
+ <file_item>/etc/ssh/ssh_host_ecdsa_key</file_item>
+ <file_item>/etc/ssh/ssh_host_ecdsa_key.pub</file_item>
</optional_files>
</copy_to_system_item>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.21.25/startup/YaST2.call
new/yast2-installation-2.21.28/startup/YaST2.call
--- old/yast2-installation-2.21.25/startup/YaST2.call 2011-10-19
12:18:34.000000000 +0200
+++ new/yast2-installation-2.21.28/startup/YaST2.call 2011-11-06
18:00:37.000000000 +0100
@@ -22,7 +22,7 @@
# : which is the same as the NCURSES mode
# : - VNC Installation via browser
# :
-# STATUS : $Id: YaST2.call 64067 2011-05-19 12:22:36Z jsuchome $
+# STATUS : $Id: YaST2.call 66674 2011-11-03 11:20:48Z aschnell $
#----------------
#
#set -x
@@ -392,6 +392,7 @@
# 1) Source common script functions
#---------------------------------------------
. /usr/lib/YaST2/startup/common/functions.sh
+. /usr/lib/YaST2/startup/common/network.sh
. /usr/lib/YaST2/startup/requires
#=============================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.21.25/startup/common/network.sh
new/yast2-installation-2.21.28/startup/common/network.sh
--- old/yast2-installation-2.21.25/startup/common/network.sh 2011-10-19
12:18:36.000000000 +0200
+++ new/yast2-installation-2.21.28/startup/common/network.sh 2011-11-06
18:00:37.000000000 +0100
@@ -12,7 +12,7 @@
# DESCRIPTION : Common used functions used for the YaST2 startup process
# : refering to network environment issues
# :
-# STATUS : $Id: network.sh 43948 2008-01-28 14:12:56Z aschnell $
+# STATUS : $Id: network.sh 66674 2011-11-03 11:20:48Z aschnell $
#----------------
#
#----[ is_iface_up ]-----#
@@ -41,6 +41,13 @@
return 1
}
+
+function list_ifaces()
+{
+ /sbin/ifconfig | grep -A1 "^[a-z]"
+}
+
+
#----[ vnc_message ]-----#
function vnc_message () {
#--------------------------------------------------
@@ -70,7 +77,6 @@
active interfaces:
EOF
- /sbin/ifconfig | grep -A1 "^[a-z]"
+ list_ifaces
echo
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.21.25/startup/common/vnc.sh
new/yast2-installation-2.21.28/startup/common/vnc.sh
--- old/yast2-installation-2.21.25/startup/common/vnc.sh 2011-10-19
12:18:35.000000000 +0200
+++ new/yast2-installation-2.21.28/startup/common/vnc.sh 2011-11-06
18:00:37.000000000 +0100
@@ -13,7 +13,7 @@
# DESCRIPTION : VNC helper functions to start the Xvnc server
# :
# :
-# STATUS : $Id: vnc.sh 49104 2008-07-15 14:14:38Z aschnell $
+# STATUS : $Id: vnc.sh 66674 2011-11-03 11:20:48Z aschnell $
#----------------
. /etc/YaST2/XVersion
@@ -44,38 +44,27 @@
# start Xvnc server and write a log file from the
# VNC server process
#
- # .../
# The IP set in install.inf may not be valid if the DHCP server
# gave us a different lease in the meantime (#43974).
- # sed: don't print; if it's localhost, skip; try locating IPv4;
- # skip if not found; otherwise print and exit
- # ----
- IP=`ip addr list | sed -n \
- -e
'/127.0.0.[[:digit:]]/b;s/^[[:space:]]*inet[[:space:]]\([^/]*\).*/\1/;T;p;q'`
echo
echo starting VNC server...
echo A log file will be written to: /var/log/YaST2/vncserver.log ...
cat <<-EOF
-
+
***
- *** You can connect to $IP, display :1 now with vncviewer
- *** Or use a Java capable browser on http://$IP:5801/
+ *** You can connect to <host>, display :1 now with vncviewer
+ *** Or use a Java capable browser on http://<host>:5801/
***
-
+
(When YaST2 is finished, close your VNC viewer and return to this
window.)
-
+
+ Active interfaces:
+
EOF
- #==========================================
- # Fake hostname to make VNC screen pretty
- #------------------------------------------
- if [ "$(hostname)" = "(none)" ] ; then
- hostname $IP
- fi
- #==========================================
- # store hostname for use in desktop option
- #------------------------------------------
- VNC_HOSTNAME=`hostname`
+ list_ifaces
+ echo
+
#==========================================
# Start Xvnc...
# For -noreset see BNC #351338
@@ -83,7 +72,7 @@
$Xbindir/Xvnc $Xvncparam :0 \
-noreset \
-rfbauth /root/.vnc/passwd.yast \
- -desktop "Installation at: $VNC_HOSTNAME" \
+ -desktop "Installation" \
-geometry 800x600 \
-depth 16 \
-rfbwait 120000 \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
