Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2013-05-14 07:11:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2013-04-23 11:40:49.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2013-05-14 07:11:12.000000000 +0200
@@ -1,0 +2,15 @@
+Mon May 13 09:40:15 CEST 2013 - [email protected]
+
+- startup scripts: if RC_LANG is not set, use en_US as default
+ (bnc#815265)
+- 2.24.4
+
+-------------------------------------------------------------------
+Fri May 03 12:18:43 CEST 2013 - [email protected]
+
+- call unicode_start/stop and initviocons only on consoles
+ (bnc#800790)
+- fixed check for missing initviocons
+- 2.24.3
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.24.2.tar.bz2
New:
----
yast2-installation-2.24.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.DkaE8Y/_old 2013-05-14 07:11:14.000000000 +0200
+++ /var/tmp/diff_new_pack.DkaE8Y/_new 2013-05-14 07:11:14.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 2.24.2
+Version: 2.24.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-2.24.2.tar.bz2 -> yast2-installation-2.24.4.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-2.24.2/VERSION
new/yast2-installation-2.24.4/VERSION
--- old/yast2-installation-2.24.2/VERSION 2013-04-22 15:06:35.000000000
+0200
+++ new/yast2-installation-2.24.4/VERSION 2013-05-13 10:35:26.000000000
+0200
@@ -1 +1 @@
-2.24.2
+2.24.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-2.24.2/configure
new/yast2-installation-2.24.4/configure
--- old/yast2-installation-2.24.2/configure 2013-04-22 15:06:54.000000000
+0200
+++ new/yast2-installation-2.24.4/configure 2013-05-13 15:57:03.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-installation 2.24.2.
+# Generated by GNU Autoconf 2.69 for yast2-installation 2.24.4.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.24.2'
-PACKAGE_STRING='yast2-installation 2.24.2'
+PACKAGE_VERSION='2.24.4'
+PACKAGE_STRING='yast2-installation 2.24.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1258,7 +1258,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-installation 2.24.2 to adapt to many kinds of
systems.
+\`configure' configures yast2-installation 2.24.4 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1330,7 +1330,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.24.2:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.24.4:";;
esac
cat <<\_ACEOF
@@ -1410,7 +1410,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.24.2
+yast2-installation configure 2.24.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1427,7 +1427,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-installation $as_me 2.24.2, which was
+It was created by yast2-installation $as_me 2.24.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2366,7 +2366,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.24.2'
+ VERSION='2.24.4'
cat >>confdefs.h <<_ACEOF
@@ -2489,7 +2489,7 @@
-VERSION="2.24.2"
+VERSION="2.24.4"
RPMNAME="yast2-installation"
MAINTAINER="Jiří Suchomel <[email protected]>"
@@ -3648,7 +3648,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-installation $as_me 2.24.2, which was
+This file was extended by yast2-installation $as_me 2.24.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3701,7 +3701,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-installation config.status 2.24.2
+yast2-installation config.status 2.24.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-2.24.2/configure.in
new/yast2-installation-2.24.4/configure.in
--- old/yast2-installation-2.24.2/configure.in 2013-04-22 15:06:50.000000000
+0200
+++ new/yast2-installation-2.24.4/configure.in 2013-05-13 15:56:59.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.24.2, http://bugs.opensuse.org/,
yast2-installation)
+AC_INIT(yast2-installation, 2.24.4, 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.24.2"
+VERSION="2.24.4"
RPMNAME="yast2-installation"
MAINTAINER="Jiří Suchomel <[email protected]>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-2.24.2/startup/First-Stage/F06-terminal
new/yast2-installation-2.24.4/startup/First-Stage/F06-terminal
--- old/yast2-installation-2.24.2/startup/First-Stage/F06-terminal
2013-01-22 11:22:35.000000000 +0100
+++ new/yast2-installation-2.24.4/startup/First-Stage/F06-terminal
2013-05-03 14:06:34.000000000 +0200
@@ -7,12 +7,12 @@
#---------------------------------------------
# ---- DISABLED: S390 console check ----
# . /usr/lib/YaST2/startup/arch/s390/console.sh
-# BEG S390: check if initvicons needs to be called
-# s390_check_need_initvicons
+# BEG S390: check if initviocons needs to be called
+# s390_check_need_initviocons
# END S390:
-if ! skip_initvicons;then
- eval `initviocons -e`
+if ! skip_initviocons ; then
+ eval `/bin/initviocons -e`
#export TERM only, initviocons takes care about
#LINES and COLUMNS automatically (#184179)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-2.24.2/startup/Second-Stage/S05-config
new/yast2-installation-2.24.4/startup/Second-Stage/S05-config
--- old/yast2-installation-2.24.2/startup/Second-Stage/S05-config
2013-01-22 11:22:35.000000000 +0100
+++ new/yast2-installation-2.24.4/startup/Second-Stage/S05-config
2013-05-03 14:06:34.000000000 +0200
@@ -12,12 +12,12 @@
#---------------------------------------------
# ---- DISABLED: S390 console check ----
# . /usr/lib/YaST2/startup/arch/s390/console.sh
-# BEG S390: check if initvicons needs to be called
-# s390_check_need_initvicons
+# BEG S390: check if initviocons needs to be called
+# s390_check_need_initviocons
# END S390:
-if ! skip_initvicons;then
- eval `initviocons -e`
+if ! skip_initviocons ; then
+ eval `/bin/initviocons -e`
#export TERM only, initviocons takes care about
#LINES and COLUMNS automatically (#184179)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-2.24.2/startup/arch/s390/console.sh
new/yast2-installation-2.24.4/startup/arch/s390/console.sh
--- old/yast2-installation-2.24.2/startup/arch/s390/console.sh 2013-01-22
11:22:35.000000000 +0100
+++ new/yast2-installation-2.24.4/startup/arch/s390/console.sh 2013-05-03
14:06:34.000000000 +0200
@@ -1,14 +1,14 @@
#!/bin/sh
-function s390_check_need_initvicons () {
+function s390_check_need_initviocons () {
[ -n "$HOSTTYPE" ] || HOSTTYPE=$(arch)
if [ "$HOSTTYPE" = "s390" ];then
- export NEED_INITVICONS="no"
+ export NEED_INITVIOCONS="no"
return
fi
if [ "$HOSTTYPE" = "s390x" ];then
- export NEED_INITVICONS="no"
+ export NEED_INITVIOCONS="no"
return
fi
- export NEED_INITVICONS="yes"
+ export NEED_INITVIOCONS="yes"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-2.24.2/startup/common/language.sh
new/yast2-installation-2.24.4/startup/common/language.sh
--- old/yast2-installation-2.24.2/startup/common/language.sh 2013-01-22
11:22:35.000000000 +0100
+++ new/yast2-installation-2.24.4/startup/common/language.sh 2013-05-13
10:35:26.000000000 +0200
@@ -83,6 +83,11 @@
# returns an appropriate exit code. This code only
# works in second stage (continue)
# ---
+ if [ -z "$RC_LANG" ]; then
+ log "\tRC_LANG not set, using en_US as default..."
+ export RC_LANG=en_US
+ fi
+
if [ ! -x /bin/testutf8 ];then
return
fi
@@ -105,12 +110,20 @@
#--------------------------------------------------
# start unicode mode if LANG is a UTF-8 locale
# ---
- if [ -x /bin/unicode_start ];then
- if echo $LANG | grep -q '\.UTF-8$'; then
+ if [ ! -x /bin/unicode_start ] ; then
+ return
+ fi
+
+ # unicode_starts/stop should only be called on consoles, see bnc #800790
+ TTY=`/usr/bin/tty`
+ if [ "$TTY" != "/dev/console" -a "$TTY" == "${TTY#/dev/tty[0-9]}" ] ;
then
+ return
+ fi
+
+ if echo $LANG | grep -q '\.UTF-8$' ; then
log "\tStarting UTF-8 mode..."
unicode_start
fi
- fi
}
#----[ stop_unicode ]-----#
@@ -118,11 +131,18 @@
#--------------------------------------------------
# stop unicode mode if LANG is a UTF-8 locale
# ---
- if [ -x /bin/unicode_stop ];then
- if echo $LANG | grep -q '\.UTF-8$'; then
+ if [ ! -x /bin/unicode_stop ] ; then
+ return
+ fi
+
+ # unicode_start/stop should only be called on consoles, see bnc #800790
+ TTY=`/usr/bin/tty`
+ if [ "$TTY" != "/dev/console" -a "$TTY" == "${TTY#/dev/tty[0-9]}" ] ;
then
+ return
+ fi
+
+ if echo $LANG | grep -q '\.UTF-8$' ; then
log "\tStopping UTF-8 mode..."
unicode_stop
fi
- fi
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-2.24.2/startup/common/misc.sh
new/yast2-installation-2.24.4/startup/common/misc.sh
--- old/yast2-installation-2.24.2/startup/common/misc.sh 2013-02-14
17:11:34.000000000 +0100
+++ new/yast2-installation-2.24.4/startup/common/misc.sh 2013-05-03
14:06:34.000000000 +0200
@@ -208,12 +208,21 @@
/sbin/modprobe $1
}
-#----[ skip_initvicons ]----#
-function skip_initvicons () {
+#----[ skip_initviocons ]----#
+function skip_initviocons () {
#------------------------------------------------------
-# check if the call to initvicons must be skipped
+# check if the call to initviocons must be skipped
# ---
- # #173426#c17: it is missing on single-CD repos
- test -x /bin/initviocons || return 1
+ # bnc #173426#c17: it is missing on single-CD repos
+ if [ ! -x /bin/initviocons ] ; then
+ return 0
+ fi
+
+ # initviocons should only be required on consoles, see bnc #800790
+ TTY=`/usr/bin/tty`
+ if [ "$TTY" != "/dev/console" -a "$TTY" == "${TTY#/dev/tty[0-9]}" ] ;
then
+ return 0
+ fi
+
grep -qw TERM /proc/cmdline && return 0 || return 1
}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
