Hello community, here is the log from the commit of package yast2-s390 for openSUSE:Factory checked in at Fri May 6 14:37:09 CEST 2011.
-------- --- yast2-s390/yast2-s390.changes 2009-11-12 17:53:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-s390/yast2-s390.changes 2011-05-05 11:17:33.000000000 +0200 @@ -1,0 +2,55 @@ +Thu May 05 11:10:41 CEST 2011 - [email protected] + +- set exclusive architecture to s390 and s390x (bnc #690511) +- 2.21.0 + +------------------------------------------------------------------- +Tue Feb 15 10:48:06 CET 2011 - [email protected] + +- added time-out when asking about formatting a disk during + AutoInstallation (bnc#668317) + +------------------------------------------------------------------- +Thu Oct 21 17:46:53 CEST 2010 - [email protected] + +- DASD: if possible, use device by-path in AY Export (bnc#591603) +- 2.19.5 + +------------------------------------------------------------------- +Wed Aug 18 15:14:52 CEST 2010 - [email protected] + +- fixed typo (bnc#631743) +- 2.19.4 + +------------------------------------------------------------------- +Tue Feb 2 16:28:53 CET 2010 - [email protected] + +- DASD: support for additional dasd_configure ret codes (bnc#561876) +- 2.19.3 + +------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - [email protected] + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- +Mon Dec 21 17:20:19 CET 2009 - [email protected] + +- dasd: activation non-formated devices (bnc#446998) +- 2.19.2 + +------------------------------------------------------------------- +Tue Dec 1 14:10:04 CET 2009 - [email protected] + +- fixed desktop files (bnc#559343) +- 2.19.1 + +------------------------------------------------------------------- +Mon Nov 30 09:25:00 CET 2009 - [email protected] + +- dasd: activation non-formated devices (bnc#446998) +- 2.19.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-s390-2.18.7.tar.bz2 New: ---- yast2-s390-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-s390.spec ++++++ --- /var/tmp/diff_new_pack.4JrCnb/_old 2011-05-06 14:29:07.000000000 +0200 +++ /var/tmp/diff_new_pack.4JrCnb/_new 2011-05-06 14:29:07.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-s390 (Version 2.18.7) +# spec file for package yast2-s390 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,18 +19,20 @@ Name: yast2-s390 -Version: 2.18.7 -Release: 2 +Version: 2.21.0 +Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-s390-2.18.7.tar.bz2 +Source0: yast2-s390-2.21.0.tar.bz2 + Prefix: /usr + Group: System/YaST -License: GPL v2 or later +License: GPLv2+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite -Requires: yast2 -%ifarch s390 s390x -Requires: s390-tools -%endif +ExclusiveArch: s390 s390x +Requires: yast2 s390-tools + Summary: YaST2 - S/390 Specific Features Configuration %description @@ -38,14 +40,16 @@ S/390-specific features. %prep -%setup -n yast2-s390-2.18.7 +%setup -n yast2-s390-2.21.0 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) @@ -73,4 +77,5 @@ %{prefix}/share/applications/YaST2/*.desktop /usr/share/YaST2/schema/autoyast/rnc/*.rnc %doc %{prefix}/share/doc/packages/yast2-s390 + %changelog ++++++ yast2-s390-2.18.7.tar.bz2 -> yast2-s390-2.21.0.tar.bz2 ++++++ ++++ 9038 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-s390-2.18.7/MAINTAINER new/yast2-s390-2.21.0/MAINTAINER --- old/yast2-s390-2.18.7/MAINTAINER 2009-01-23 11:44:19.000000000 +0100 +++ new/yast2-s390-2.21.0/MAINTAINER 2011-03-07 12:03:57.000000000 +0100 @@ -1 +1 @@ -Michal Zugec <[email protected]> +Arvin Schnell <[email protected]> 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-s390-2.18.7/Makefile.am new/yast2-s390-2.21.0/Makefile.am --- old/yast2-s390-2.18.7/Makefile.am 2008-12-02 14:53:13.000000000 +0100 +++ new/yast2-s390-2.21.0/Makefile.am 2011-05-05 11:14:42.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ 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-s390-2.18.7/VERSION new/yast2-s390-2.21.0/VERSION --- old/yast2-s390-2.18.7/VERSION 2009-11-05 17:30:06.000000000 +0100 +++ new/yast2-s390-2.21.0/VERSION 2011-05-05 11:10:31.000000000 +0200 @@ -1 +1 @@ -2.18.7 +2.21.0 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-s390-2.18.7/autodocs-ycp.ami new/yast2-s390-2.21.0/autodocs-ycp.ami --- old/yast2-s390-2.18.7/autodocs-ycp.ami 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-s390-2.21.0/autodocs-ycp.ami 2011-05-05 11:14:42.000000000 +0200 @@ -0,0 +1,32 @@ +# -*- makefile -*- Automake include file +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ + +# Builds source documentation for YCP sources +# Uses ycpdoc +# PARAMETERS: +# AUTODOCS_YCP: Files that the ycp autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.ycp +# AUTODOCS_PM: Files that the perl autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src + +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs + +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) +CLEANFILES = $(html_DATA) pod2htm*.tmp + +AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) +AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src + +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +#including *.pm, for the index + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) + for i in $(AUTODOCS_PM); do \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ + pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ + done 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-s390-2.18.7/configure.in new/yast2-s390-2.21.0/configure.in --- old/yast2-s390-2.18.7/configure.in 2008-12-02 14:53:12.000000000 +0100 +++ new/yast2-s390-2.21.0/configure.in 2011-05-05 11:14:42.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-s390 dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-s390, 2.16.0, http://bugs.opensuse.org/, yast2-s390) +AC_INIT(yast2-s390, 2.21.0, http://bugs.opensuse.org/, yast2-s390) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,9 +18,9 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.0" +VERSION="2.21.0" RPMNAME="yast2-s390" -MAINTAINER="Jiri Srain <[email protected]>" +MAINTAINER="Arvin Schnell <[email protected]>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig 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-s390-2.18.7/missing new/yast2-s390-2.21.0/missing --- old/yast2-s390-2.18.7/missing 2008-12-02 14:53:25.000000000 +0100 +++ new/yast2-s390-2.21.0/missing 2011-05-05 11:14:45.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <[email protected]>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: 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-s390-2.18.7/src/clients/dasd.desktop new/yast2-s390-2.21.0/src/clients/dasd.desktop --- old/yast2-s390-2.18.7/src/clients/dasd.desktop 2008-07-16 18:21:19.000000000 +0200 +++ new/yast2-s390-2.21.0/src/clients/dasd.desktop 2010-01-14 12:30:12.000000000 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; X-KDE-ModuleType=Library X-KDE-RootOnly=true @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstClonable=true Icon=yast-dasd -Exec=/sbin/yast2 dasd +Exec=xdg-su -c "/sbin/yast2 dasd" Name=DASD GenericName=Configure dasd -X-KDE-SubstituteUID=true StartupNotify=true 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-s390-2.18.7/src/clients/dasd_auto.ycp new/yast2-s390-2.21.0/src/clients/dasd_auto.ycp --- old/yast2-s390-2.18.7/src/clients/dasd_auto.ycp 2008-01-24 14:40:10.000000000 +0100 +++ new/yast2-s390-2.21.0/src/clients/dasd_auto.ycp 2011-05-05 11:08:57.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Client for autoinstallation * Authors: Jiri Srain <[email protected]> * - * $Id: dasd_auto.ycp 19066 2004-09-03 12:40:40Z jsrain $ + * $Id: dasd_auto.ycp 63901 2011-05-05 09:08:55Z aschnell $ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. @@ -24,7 +24,7 @@ textdomain "s390"; y2milestone("----------------------------------------"); -y2milestone("DADS auto started"); +y2milestone("DASD auto started"); import "DASDController"; include "s390/dasd/wizards.ycp"; @@ -83,7 +83,7 @@ ret = DASDController::Read(); Progress::on(); } -/* Write givven settings */ +/* Write given settings */ else if (func == "Write") { import "Progress"; Progress::off(); 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-s390-2.18.7/src/clients/dump.desktop new/yast2-s390-2.21.0/src/clients/dump.desktop --- old/yast2-s390-2.18.7/src/clients/dump.desktop 2008-07-16 18:21:19.000000000 +0200 +++ new/yast2-s390-2.21.0/src/clients/dump.desktop 2010-01-14 12:30:12.000000000 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; X-KDE-ModuleType=Library X-KDE-RootOnly=true @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-dump -Exec=/sbin/yast2 dump +Exec=xdg-su -c "/sbin/yast2 dump" Name=Dump Devices GenericName=Configure Dump Devices 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-s390-2.18.7/src/clients/xpram.desktop new/yast2-s390-2.21.0/src/clients/xpram.desktop --- old/yast2-s390-2.18.7/src/clients/xpram.desktop 2008-07-16 18:21:19.000000000 +0200 +++ new/yast2-s390-2.21.0/src/clients/xpram.desktop 2010-01-14 12:30:12.000000000 +0100 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=xpram Icon=yast-xpram -Exec=/sbin/yast2 xpram +Exec=xdg-su -c "/sbin/yast2 xpram" Name=XPRAM device GenericName=Configure an XpRAM device (XpRAM) -X-KDE-SubstituteUID=true StartupNotify=true 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-s390-2.18.7/src/clients/zfcp.desktop new/yast2-s390-2.21.0/src/clients/zfcp.desktop --- old/yast2-s390-2.18.7/src/clients/zfcp.desktop 2008-07-16 18:21:19.000000000 +0200 +++ new/yast2-s390-2.21.0/src/clients/zfcp.desktop 2010-01-14 12:30:12.000000000 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; X-KDE-ModuleType=Library X-KDE-RootOnly=true @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstClonable=true Icon=yast-zfcp -Exec=/sbin/yast2 zfcp +Exec=xdg-su -c "/sbin/yast2 zfcp" Name=Zfcp GenericName=Configure zfcp -X-KDE-SubstituteUID=true StartupNotify=true 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-s390-2.18.7/src/clients/zfcp_auto.ycp new/yast2-s390-2.21.0/src/clients/zfcp_auto.ycp --- old/yast2-s390-2.18.7/src/clients/zfcp_auto.ycp 2008-01-24 14:40:10.000000000 +0100 +++ new/yast2-s390-2.21.0/src/clients/zfcp_auto.ycp 2011-05-05 11:08:57.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Client for autoinstallation * Authors: Jiri Srain <[email protected]> * - * $Id: zfcp_auto.ycp 19066 2004-09-03 12:40:40Z jsrain $ + * $Id: zfcp_auto.ycp 63901 2011-05-05 09:08:55Z aschnell $ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. @@ -24,7 +24,7 @@ textdomain "s390"; y2milestone("----------------------------------------"); -y2milestone("DADS auto started"); +y2milestone("ZFCP auto started"); import "ZFCPController"; include "s390/zfcp/wizards.ycp"; @@ -83,7 +83,7 @@ ret = ZFCPController::Read(); Progress::on(); } -/* Write givven settings */ +/* Write given settings */ else if (func == "Write") { import "Progress"; Progress::off(); 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-s390-2.18.7/src/dasd/dialogs.ycp new/yast2-s390-2.21.0/src/dasd/dialogs.ycp --- old/yast2-s390-2.18.7/src/dasd/dialogs.ycp 2008-01-24 14:40:10.000000000 +0100 +++ new/yast2-s390-2.21.0/src/dasd/dialogs.ycp 2009-11-13 12:21:08.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Srain <[email protected]> * - * $Id: dialogs.ycp 30282 2006-04-20 12:55:54Z ug $ + * $Id: dialogs.ycp 59505 2009-11-12 16:52:50Z mzugec $ */ { @@ -254,9 +254,9 @@ term content = `VBox( `HBox( // text entry - `TextEntry(`id(`min_chan), _("Mi&nimum Channel"), "0.0.0000"), + `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel"), "0.0.0000"), // text entry - `TextEntry(`id(`max_chan), _("Ma&ximum Channel"), "0.f.ffff"), + `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel"), "0.f.ffff"), `VBox ( `Label (""), // push button 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-s390-2.18.7/src/modules/DASDController.ycp new/yast2-s390-2.21.0/src/modules/DASDController.ycp --- old/yast2-s390-2.18.7/src/modules/DASDController.ycp 2009-11-05 17:30:43.000000000 +0100 +++ new/yast2-s390-2.21.0/src/modules/DASDController.ycp 2011-02-15 11:29:34.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Controller settings, input and output functions * Authors: Jiri Srain <[email protected]> * - * $Id: DASDController.ycp 59353 2009-11-05 16:30:43Z mzugec $ + * $Id: DASDController.ycp 63413 2011-02-15 09:53:24Z jsrain $ * * Representation of the configuration of controller. * Input and output routines. @@ -22,6 +22,7 @@ import "Summary"; import "Arch"; import "FileUtils"; +import "Popup"; global map<integer,map<string,any> > devices = $[]; @@ -35,6 +36,7 @@ global define void ActivateDisk (string channel, boolean diag); +global define void DeactivateDisk (string channel, boolean diag); global define void ProbeDisks (); global define void FormatDisks (list<string> disks_list, integer par, boolean write_vl, boolean interactive); @@ -195,6 +197,8 @@ if (Mode::config ()) { list l = maplist (integer i, map<string,any> d, devices, { + // if possible, use device by-path (bnc#591603) + if (haskey(d, "dev_name") && size(d["dev_names"]:[])>1) d["dev_name"]=d["dev_names", 1]:""; return d; }); @@ -405,6 +409,16 @@ Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not load module"), id)); + else if (ret == 7) + //bugzilla.novell.com/show_bug.cgi?id=561876#c8 + Report::Error (sformat ( + // error report, %1 is device identification + _("%1: Failed to activate DASD"), id)); + else if (ret == 8) + //bugzilla.novell.com/show_bug.cgi?id=561876#c8 + Report::Error (sformat ( + // error report, %1 is device identification + _("%1: DASD is not formatted"), id)); else Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code @@ -425,9 +439,31 @@ 1, diag ? 1 : 0 ); - y2milestone ("Running command %1", command); integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + y2milestone ("Running command %1 with exit code %2", command, ret); + if (ret == 5){ + string popup = sformat (_("Device %1 is unformatted. Format device now?\nIf you want to format multiple devices in parallel,\npress Cancel and select 'Perform Action', 'Format' later on!"), channel); + if ((Mode::autoinst() && Popup::TimedOKCancel(popup, 10)) + || Popup::ContinueCancel (popup)) + { + string cmd = sformat("ls /sys/bus/ccw/devices/%1/block/|tr -d '\n'", channel); + map<string, any> disk = (map<string, any>)SCR::Execute(.target.bash_output, cmd); + if (disk["exit"]:-1 == 0 && size(disk["stdout"]:"")>0){ + FormatDisks ([ sformat("/dev/%1", disk["stdout"]:"") ], 1, true, true); +// ReloadDASDDialog (); + ActivateDisk(channel, diag); + } else { + Popup::Error(sformat("Couldn't find device for %1 channel", channel)); + } + } + } else if (ret == 7){ + // when return code is 7, set DASD offline + // https://bugzilla.novell.com/show_bug.cgi?id=561876#c9 + DeactivateDisk(channel, diag); + } + else { + ReportActivationError (channel, ret); + } disk_configured = true; } @@ -476,7 +512,7 @@ if (! write_vl) additional_param = "--no-label"; string command = sformat ( - "/sbin/dasdfmt -Y -P %2 -b 4096 -y -m 1 %3 %1", disks_param, par, + "/sbin/dasdfmt -P %2 -b 4096 -y -m 1 %3 %1", disks_param, par, additional_param); y2milestone ("Running command %1", command); 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-s390-2.18.7/src/modules/Dump.ycp new/yast2-s390-2.21.0/src/modules/Dump.ycp --- old/yast2-s390-2.18.7/src/modules/Dump.ycp 2009-10-19 15:39:32.000000000 +0200 +++ new/yast2-s390-2.21.0/src/modules/Dump.ycp 2010-08-19 09:55:00.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Creating dump devices for S/390 * Authors: Jiri Srain <[email protected]> * - * $Id: Dump.ycp 59090 2009-10-19 13:39:31Z mzugec $ + * $Id: Dump.ycp 62398 2010-08-18 13:15:33Z mzugec $ * */ @@ -126,7 +126,7 @@ err = _("Support program not installed."); else if (ret == 11) // error description - err = _("Invalid or unuseable disk (fatal)."); + err = _("Invalid or unusable disk (fatal)."); else if (ret == 12) // error description err = _("Minor error, can be corrected with -f."); 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-s390-2.18.7/src/modules/ZFCPController.ycp new/yast2-s390-2.21.0/src/modules/ZFCPController.ycp --- old/yast2-s390-2.18.7/src/modules/ZFCPController.ycp 2008-01-24 14:40:10.000000000 +0100 +++ new/yast2-s390-2.21.0/src/modules/ZFCPController.ycp 2011-05-05 11:09:34.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Controller settings, input and output functions * Authors: Jiri Srain <[email protected]> * - * $Id: ZFCPController.ycp 40596 2007-08-30 07:34:57Z mzugec $ + * $Id: ZFCPController.ycp 59505 2009-11-12 16:52:50Z mzugec $ * * Representation of the configuration of controller. * Input and output routines. @@ -27,9 +27,9 @@ global map<integer, boolean> selected = $[]; -global string filter_min = "0x0000"; +global string filter_min = "0.0.0000"; -global string filter_max = "0xffff"; +global string filter_max = "0.f.ffff"; global map<string, any> previous_settings = $[]; 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-s390-2.18.7/src/zfcp/dialogs.ycp new/yast2-s390-2.21.0/src/zfcp/dialogs.ycp --- old/yast2-s390-2.18.7/src/zfcp/dialogs.ycp 2009-08-07 11:06:46.000000000 +0200 +++ new/yast2-s390-2.21.0/src/zfcp/dialogs.ycp 2011-05-05 11:09:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Srain <[email protected]> * - * $Id: dialogs.ycp 58295 2009-08-07 09:06:45Z mzugec $ + * $Id: dialogs.ycp 59505 2009-11-12 16:52:50Z mzugec $ */ { @@ -53,20 +53,36 @@ * @param max_chan integer maximal channel number * @return a list of terms for the table */ -define list<term> GetZFCPDiskItems(integer min_chan, integer max_chan) ``{ +define list<term> GetZFCPDiskItems(string min_channel, string max_channel) ``{ integer id = 0; - list<term> items = []; map<integer,map<string,any> > devices = ZFCPController::devices; - if (min_chan >= 0) + integer min_css = tointeger(substring (min_channel, 0, 1)); + integer min_lcss = tointeger(sformat("0x%1",substring (min_channel, 2, 1))); + integer min_chan = tointeger(sformat("0x%1",substring (min_channel, 4, 4))); + + integer max_css = tointeger(substring (max_channel, 0, 1)); + integer max_lcss = tointeger(sformat("0x%1",substring (max_channel, 2, 1))); + integer max_chan = tointeger(sformat("0x%1",substring (max_channel, 4, 4))); + + + if (min_chan > 0 || min_lcss > 0 || min_css > 0 || + max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) { devices = (map<integer,map<string,any> >)filter ( integer k, map<string,any> d, devices, ``{ - integer channel = d["resource", "io", 0, "start"]:0; - return (channel >= min_chan && channel <= max_chan); + string channel = d["detail", "controller_id"]:"0.0.0000"; + integer tmp_css = tointeger(substring (channel, 0, 1)); + integer tmp_lcss = tointeger(sformat("0x%1",substring (channel, 2, 1))); + integer tmp_chan = tointeger(sformat("0x%1",substring (channel, 4, 4))); + + + boolean ret = (tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan + && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan); + return ret; }); } @@ -92,16 +108,12 @@ * Restart the ZFCP-Dialog */ define void ReloadZFCPDialog () ``{ - ZFCPController::filter_min = (string) - UI::QueryWidget(`min_chan, `Value); - ZFCPController::filter_max = (string) - UI::QueryWidget(`max_chan, `Value); + ZFCPController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); + ZFCPController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); ZFCPController::ProbeDisks (); - list<term> items = GetZFCPDiskItems ( - tointeger(ZFCPController::filter_min), - tointeger(ZFCPController::filter_max)); + list<term> items = GetZFCPDiskItems (ZFCPController::filter_min, ZFCPController::filter_max); UI::ChangeWidget(`id(`table), `Items, items); UI::ChangeWidget (`id (`delete), `Enabled, size (items) > 0); @@ -123,9 +135,9 @@ term content = `VBox( `HBox( // text entry - `TextEntry(`id(`min_chan), _("Mi&nimum Channel"), "0x0000"), + `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel"), ZFCPController::filter_min), // text entry - `TextEntry(`id(`max_chan), _("Ma&ximum Channel"), "0xffff"), + `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel"), ZFCPController::filter_max), `VBox ( `Label (""), // push button ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
