May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit kcall for openSUSE:Factory
by root＠Hilbert.suse.de 08 May '09

08 May '09

Hello community, here is the log from the commit of package kcall for openSUSE:Factory checked in at Fri May 8 14:50:01 CEST 2009. -------- --- KDE/kcall/kcall.changes 2009-01-21 12:09:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/kcall/kcall.changes 2009-05-08 11:49:49.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 8 11:49:39 CEST 2009 - dmueller(a)suse.de + +- fix build with cmake 2.6.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcall.spec ++++++ --- /var/tmp/diff_new_pack.K10432/_old 2009-05-08 14:49:10.000000000 +0200 +++ /var/tmp/diff_new_pack.K10432/_new 2009-05-08 14:49:10.000000000 +0200 @@ -25,7 +25,7 @@ Group: Productivity/Telephony/SIP/Clients Summary: SIP (Voice over IP) Solution for KDE and Kontact Version: 0.7.0 -Release: 175 +Release: 176 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libkde4 >= %( echo `rpm -q --queryformat '%{VERSION}' libkde4`) Source0: %name-%version.tar.bz2 @@ -85,6 +85,8 @@ /usr/share/icons/crystalsvg/16x16/actions/* %changelog +* Fri May 08 2009 dmueller(a)suse.de +- fix build with cmake 2.6.4 * Wed Jan 21 2009 coolo(a)suse.de - fix build with kde 4.2 * Tue May 13 2008 dmueller(a)suse.de ++++++ kcall-fixes-from-svn.diff ++++++ --- /var/tmp/diff_new_pack.K10432/_old 2009-05-08 14:49:10.000000000 +0200 +++ /var/tmp/diff_new_pack.K10432/_new 2009-05-08 14:49:10.000000000 +0200 @@ -1,5 +1,5 @@ ---- kcall/kontactplugin/kcall_plugin.cpp (revision 728420) -+++ kcall/kontactplugin/kcall_plugin.cpp (revision 728420) +--- kcall/kontactplugin/kcall_plugin.cpp ++++ kcall/kontactplugin/kcall_plugin.cpp @@ -168,7 +168,7 @@ void KCallUniqueAppHandler::loadCommandL int KCallUniqueAppHandler::newInstance() @@ -18,8 +18,8 @@ if ( !handled ) // no args -> simply bring kcall plugin to front return Kontact::UniqueAppHandler::newInstance(); } ---- kcall/dtmfinput.ui (revision 728420) -+++ kcall/dtmfinput.ui (revision 728420) +--- kcall/dtmfinput.ui ++++ kcall/dtmfinput.ui @@ -9,9 +9,6 @@ <height>161</height> </rect> @@ -30,8 +30,8 @@ <layout class="QGridLayout" > <item row="0" column="0" > <widget class="QPushButton" name="button1" > ---- kcall/CMakeLists.txt (revision 728420) -+++ kcall/CMakeLists.txt (revision 728420) +--- kcall/CMakeLists.txt ++++ kcall/CMakeLists.txt @@ -71,6 +71,8 @@ SET_TARGET_PROPERTIES(kcall PROPERTIES V ) INSTALl(TARGETS kcall DESTINATION ${LIB_INSTALL_DIR}) @@ -41,8 +41,8 @@ ########### next target ############### SET(kcall_bin_SRCS ---- kcall/kcallcore.cpp (revision 728420) -+++ kcall/kcallcore.cpp (revision 728420) +--- kcall/kcallcore.cpp ++++ kcall/kcallcore.cpp @@ -294,7 +294,7 @@ void KCallCore::initActions() // misc @@ -52,8 +52,8 @@ clearLocation->setText( i18n( "Clear Search Bar" ) ); connect(clearLocation, SIGNAL(triggered(bool) ), SLOT( slotClearSearchBar() )); clearLocation->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_L)); ---- kcall/vcardview.cpp (revision 728420) -+++ kcall/vcardview.cpp (revision 728420) +--- kcall/vcardview.cpp ++++ kcall/vcardview.cpp @@ -63,7 +63,7 @@ VCardView::VCardView(HistoryModel * cons ui.vcText->hide(); @@ -72,8 +72,8 @@ ui.vcPicture->setPixmap( photo ); kDebug() << ui.vcPicture->size()<< endl; } ---- CMakeLists.txt (revision 728420) -+++ CMakeLists.txt (revision 728420) +--- CMakeLists.txt ++++ CMakeLists.txt @@ -1,20 +1,18 @@ PROJECT(kcall) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.3) @@ -97,10 +97,8 @@ OPTION(KCALL_ENABLE_KONTACT_PLUGIN "enable building of kontact plugin (unstable)" -Index: applet/kcall/kcallapplet.desktop -=================================================================== ---- applet/kcall/kcallapplet.desktop (Revision 728420) -+++ applet/kcall/kcallapplet.desktop (Revision 813349) +--- applet/kcall/kcallapplet.desktop ++++ applet/kcall/kcallapplet.desktop @@ -6,7 +6,7 @@ Name[tr]=K Çağrı Name[xx]=xxKCallxx @@ -110,10 +108,8 @@ Type=Application NoDisplay=true Terminal=false -Index: applet/kcall/CMakeLists.txt -=================================================================== ---- applet/kcall/CMakeLists.txt (Revision 728420) -+++ applet/kcall/CMakeLists.txt (Revision 813349) +--- applet/kcall/CMakeLists.txt ++++ applet/kcall/CMakeLists.txt @@ -38,7 +38,7 @@ ${KDE4_KDEUI_LIBS} ) @@ -123,10 +119,8 @@ ########### install files ############### -Index: kcall/kontactplugin/kcallplugin.desktop -=================================================================== ---- kcall/kontactplugin/kcallplugin.desktop (Revision 728420) -+++ kcall/kontactplugin/kcallplugin.desktop (Revision 813349) +--- kcall/kontactplugin/kcallplugin.desktop ++++ kcall/kontactplugin/kcallplugin.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 @@ -136,10 +130,8 @@ ServiceTypes=Kontact/Plugin,KPluginInfo X-KDE-Library=libkontact_kcallplugin -Index: kcall/main.cpp -=================================================================== ---- kcall/main.cpp (Revision 728420) -+++ kcall/main.cpp (Revision 813349) +--- kcall/main.cpp ++++ kcall/main.cpp @@ -129,6 +129,7 @@ return 0; @@ -148,10 +140,8 @@ KGlobal::locale()->insertCatalog( "libkdepim" ); bool ret = app.exec(); -Index: kcall/CMakeLists.txt -=================================================================== ---- kcall/CMakeLists.txt (Revision 728420) -+++ kcall/CMakeLists.txt (Revision 813349) +--- kcall/CMakeLists.txt ++++ kcall/CMakeLists.txt @@ -92,7 +92,7 @@ ${KDE4_KHTML_LIBS} ${DECIBEL_LDFLAGS}) @@ -161,10 +151,8 @@ ########### next target ############### -Index: kcall/kcallcore.cpp -=================================================================== ---- kcall/kcallcore.cpp (Revision 728420) -+++ kcall/kcallcore.cpp (Revision 813349) +--- kcall/kcallcore.cpp ++++ kcall/kcallcore.cpp @@ -273,7 +273,7 @@ */ @@ -183,10 +171,8 @@ clearLocation->setText( i18n( "Clear Search Bar" ) ); connect(clearLocation, SIGNAL(triggered(bool) ), SLOT( slotClearSearchBar() )); clearLocation->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_L)); -Index: kcall/kcall.desktop -=================================================================== ---- kcall/kcall.desktop (Revision 728420) -+++ kcall/kcall.desktop (Revision 813349) +--- kcall/kcall.desktop ++++ kcall/kcall.desktop @@ -6,7 +6,7 @@ Name[tr]=kçağrı Name[xx]=xxkcallxx @@ -196,8 +182,8 @@ Categories=Network;Telephony; Type=Application DocPath=kcall/kcall.html ---- kcall/CMakeLists.txt (Revision 914524) -+++ kcall/CMakeLists.txt (Revision 914525) +--- kcall/CMakeLists.txt ++++ kcall/CMakeLists.txt @@ -104,7 +104,7 @@ KDE4_ADD_PLUGIN(kcallpart WITH_PREFIX ${kcallpart_PART_SRCS}) @@ -207,3 +193,14 @@ INSTALL(TARGETS kcallpart DESTINATION ${PLUGIN_INSTALL_DIR}) +--- kcall/CMakeLists.txt ++++ kcall/CMakeLists.txt +@@ -73,8 +73,6 @@ INSTALl(TARGETS kcall DESTINATION ${LIB_INSTALL_DIR}) + + ADD_SUBDIRECTORY(icons) + +-ADD_SUBDIRECTORY (icons) +- + ########### next target ############### + + SET(kcall_bin_SRCS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit git for openSUSE:Factory
by root＠Hilbert.suse.de 08 May '09

08 May '09

Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at Fri May 8 14:48:58 CEST 2009. -------- --- git/git.changes 2009-04-20 12:46:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/git/git.changes 2009-05-08 11:40:08.000000000 +0200 @@ -1,0 +2,12 @@ +Fri May 8 11:37:26 CEST 2009 - tiwai(a)suse.de + +- updated to 1.6.3: + * major version update: git push behavior change, + With the next major release, "git push" into a branch that is + currently checked out will be refused by default. You can + choose what should happen upon such a push by setting the + configuration + * Detailed changelog found at + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.3.txt + +------------------------------------------------------------------- @@ -239,0 +252,5 @@ +Thu Dec 11 01:57:33 CET 2008 - pbaudis(a)suse.cz + +- Fix the git.xinetd daemon call [bnc#450508] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- asciidoc.diff git-1.6.2.4.tar.bz2 New: ---- git-1.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.aH9370/_old 2009-05-08 14:48:28.000000000 +0200 +++ /var/tmp/diff_new_pack.aH9370/_new 2009-05-08 14:48:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package git (Version 1.6.2.4) +# spec file for package git (Version 1.6.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -36,7 +36,7 @@ %endif BuildRequires: sgml-skel BuildRequires: xmlto -Version: 1.6.2.4 +Version: 1.6.3 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later @@ -48,7 +48,6 @@ Source3: git-daemon.init Source4: git.xinetd Source5: usr.share.git-web.gitweb.cgi -Patch: asciidoc.diff Patch3: git-nohardlink.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core = %{version} @@ -244,7 +243,6 @@ %prep %setup -q -%patch -p1 %patch3 -p1 %build @@ -420,6 +418,15 @@ /etc/bash_completion.d/git.sh %changelog +* Fri May 08 2009 tiwai(a)suse.de +- updated to 1.6.3: + * major version update: git push behavior change, + With the next major release, "git push" into a branch that is + currently checked out will be refused by default. You can + choose what should happen upon such a push by setting the + configuration + * Detailed changelog found at + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.3.txt * Mon Apr 20 2009 tiwai(a)suse.de - updated to 1.6.2.4: * The configuration parser had a buffer overflow while parsing @@ -625,6 +632,8 @@ * Wed Dec 17 2008 tiwai(a)suse.de - Fix VUL-0 Possible gitweb vulnerability: calling "git diff" [bnc#459664] +* Thu Dec 11 2008 pbaudis(a)suse.cz +- Fix the git.xinetd daemon call [bnc#450508] * Wed Nov 19 2008 tiwai(a)suse.de - install git-shell and git-cvsserver as in the upstream (bnc#446049) ++++++ git-1.6.2.4.tar.bz2 -> git-1.6.3.tar.bz2 ++++++ ++++ 38728 lines of diff (skipped) ++++++ git.xinetd ++++++ --- /var/tmp/diff_new_pack.aH9370/_old 2009-05-08 14:48:33.000000000 +0200 +++ /var/tmp/diff_new_pack.aH9370/_new 2009-05-08 14:48:33.000000000 +0200 @@ -8,7 +8,7 @@ user = git-daemon group = nogroup server = /usr/bin/git - server_args = daemon --syslog --detach --reuseaddr --user=git-daemon --group=nogroup --pid-file=/var/run/git-daemon.pid --base-path="/srv/git" + server_args = daemon --syslog --inetd --base-path="/srv/git" type = UNLISTED port = 9418 log_on_failure += USERID ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autoyast2 for openSUSE:Factory
by root＠Hilbert.suse.de 08 May '09

08 May '09

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at Fri May 8 14:47:20 CEST 2009. -------- --- autoyast2/autoyast2.changes 2009-04-02 15:58:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2009-05-05 12:50:37.000000000 +0200 @@ -1,0 +2,31 @@ +Tue May 5 10:30:43 CEST 2009 - ug(a)suse.de + +- keep_install_network docu added (thanx Bubli and Michal) +- 2.18.3 + +------------------------------------------------------------------- +Mon May 4 11:54:16 CEST 2009 - ug(a)suse.de + +- don't log passwords from "ask" fixed (bnc#492746) + +------------------------------------------------------------------- +Tue Apr 14 15:32:36 CEST 2009 - ug(a)suse.de + +- reuse old partition_id when create=false + +------------------------------------------------------------------- +Wed Apr 8 14:22:54 CEST 2009 - ug(a)suse.de + +- don't log the answers of ask dialogs via milestone + +------------------------------------------------------------------- +Wed Apr 8 12:12:22 CEST 2009 - ug(a)suse.de + +- classes and rules RNC files fixed + +------------------------------------------------------------------- +Fri Apr 3 13:08:47 CEST 2009 - ug(a)suse.de + +- postpartitioning script invented + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- autoyast2-2.18.2.tar.bz2 New: ---- autoyast2-2.18.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.nz5868/_old 2009-05-08 14:46:58.000000000 +0200 +++ /var/tmp/diff_new_pack.nz5868/_new 2009-05-08 14:46:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.18.2) +# spec file for package autoyast2 (Version 2.18.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://www.suse.de/~ug Name: autoyast2 -Version: 2.18.2 +Version: 2.18.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.18.2.tar.bz2 +Source0: autoyast2-2.18.3.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-slp yast2-testsuite yast2-transfer # API for Disabled Modules (ProductControl) @@ -63,7 +63,7 @@ %package installation License: GPL v2 or later -Version: 2.18.2 +Version: 2.18.3 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -87,7 +87,7 @@ Anas Nashif %prep -%setup -n autoyast2-2.18.2 +%setup -n autoyast2-2.18.3 %build %{prefix}/bin/y2tool y2autoconf @@ -239,6 +239,19 @@ %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf %changelog +* Tue May 05 2009 ug(a)suse.de +- keep_install_network docu added (thanx Bubli and Michal) +- 2.18.3 +* Mon May 04 2009 ug(a)suse.de +- don't log passwords from "ask" fixed (bnc#492746) +* Tue Apr 14 2009 ug(a)suse.de +- reuse old partition_id when create=false +* Wed Apr 08 2009 ug(a)suse.de +- don't log the answers of ask dialogs via milestone +* Wed Apr 08 2009 ug(a)suse.de +- classes and rules RNC files fixed +* Fri Apr 03 2009 ug(a)suse.de +- postpartitioning script invented * Wed Apr 01 2009 ug(a)suse.de - storage lib compatibility with "used_by" - 2.18.2 ++++++ autoyast2-2.18.2.tar.bz2 -> autoyast2-2.18.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/configure new/autoyast2-2.18.3/configure --- old/autoyast2-2.18.2/configure 2009-04-02 15:57:42.000000000 +0200 +++ new/autoyast2-2.18.3/configure 2009-05-05 12:39:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for autoyast2 2.18.2. +# Generated by GNU Autoconf 2.63 for autoyast2 2.18.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.18.2' -PACKAGE_STRING='autoyast2 2.18.2' +PACKAGE_VERSION='2.18.3' +PACKAGE_STRING='autoyast2 2.18.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1282,7 +1282,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 autoyast2 2.18.2 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.18.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1353,7 +1353,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of autoyast2 2.18.2:";; + short | recursive ) echo "Configuration of autoyast2 2.18.3:";; esac cat <<\_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.18.2 +autoyast2 configure 2.18.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1447,7 +1447,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by autoyast2 $as_me 2.18.2, which was +It was created by autoyast2 $as_me 2.18.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2294,7 +2294,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.18.2' + VERSION='2.18.3' cat >>confdefs.h <<_ACEOF @@ -2518,7 +2518,7 @@ -VERSION="2.18.2" +VERSION="2.18.3" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" @@ -3577,7 +3577,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by autoyast2 $as_me 2.18.2, which was +This file was extended by autoyast2 $as_me 2.18.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3627,7 +3627,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -autoyast2 config.status 2.18.2 +autoyast2 config.status 2.18.3 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/configure.in new/autoyast2-2.18.3/configure.in --- old/autoyast2-2.18.2/configure.in 2009-04-02 15:57:37.000000000 +0200 +++ new/autoyast2-2.18.3/configure.in 2009-05-05 12:39:17.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.18.2, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.18.3, http://bugs.opensuse.org/, autoyast2) 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.18.2" +VERSION="2.18.3" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/doc/CreateProfileDetails.xml new/autoyast2-2.18.3/doc/CreateProfileDetails.xml --- old/autoyast2-2.18.2/doc/CreateProfileDetails.xml 2009-03-26 15:25:26.000000000 +0100 +++ new/autoyast2-2.18.3/doc/CreateProfileDetails.xml 2009-05-05 10:42:29.000000000 +0200 @@ -1730,6 +1730,17 @@ configure and setup Ethernet Controllers and Token-Ring Controllers. </para> <para> + In the networking section, when this option is set to true (default is false, this option is available since openSUSE 11.2 but not SLES11): + <screen> + <keep_install_network config:type="boolean">true</keep_install_network> + </screen> + YaST will keep network settings created during installation (via Linuxrc) + and/or merge it with network settings from the AutoYaST profile (if these are defined). + AutoYaST settings have higher priority than already present configuration files. + YaST will write ifcfg-* files from profile without removing old ones. + If there is none (or empty) dns and routing section, YaST will keep already present values. Otherwise settings from the profile will be applied. + </para> + <para> To configure network settings and activate networking automatically, one global resource is used to store the whole network configuration. </para> @@ -2051,12 +2062,13 @@ installation. </para> <para> - In the auto-installation process, four types of scripts can be executed and they + In the auto-installation process, five types of scripts can be executed and they will be described here in order of "appearance" during the installation. </para> <para> <itemizedlist> <listitem><emphasis>pre-scripts</emphasis> (very early, before anything else really happened)</listitem> + <listitem><emphasis>postpartitioning-scripts</emphasis> (after partitioning and mounting to /mnt but before RPM installation - since openSUSE 11.2)</listitem> <listitem><emphasis>chroot-scripts</emphasis> (after the package installation, before the first boot)</listitem> <listitem><emphasis>post-scripts</emphasis> (during the first boot of the installed system, no services running)</listitem> <listitem><emphasis>init-scripts</emphasis> (during the first boot of the installed system, all servies up and running)</listitem> @@ -2153,6 +2165,85 @@ </table> </para> </section> + + <section id="postpartitioning-install.scripts"> + <title>Postpartitioning Scripts</title> + <note> + <para>Available starting from openSUSE 11.2 only (not SLES11).</para> + </note> + <para> + Executed after &yast2; did the partitioning and wrote the fstab. The empty system is mounted to /mnt already. + This type of script is available since openSUSE 11.2 (not SLES11). + </para> + <para> + The following elements must be between the <postpartitioning-scripts config:type="list"><script> ... </script></postpartitioning-sripts> tags + </para> + <para> + <table frame='top'> + <title>postpartitioning script XML representation</title> + <tgroup cols="3"> + <thead> + <row> + <entry>Element</entry> + <entry>Description</entry> + <entry>Comment</entry> + </row> + </thead> + <tbody> + <row> + <entry>location</entry> + <entry>you can define a location from where the script gets fetched. + Locations can be the same like for the profile (http,ftp,nfs,...). + <para><screen><location>http://10.10.0.1/myScript.sh</location></screen></para></entry> + <entry>either <location> or <source> must be defined</entry> + </row> + <row> + <entry>source</entry> + <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want + to put the whole shell script into the XML profile, look at the location parameter. + + <para><screen><source> +<![CDATA[ +echo "Testing postpart script" > /mnt/postpart_test.txt +]]> +</source></screen></para></entry> + <entry>Either <location> or <source> must be defined</entry> + </row> + <row> + <entry>interpreter</entry> + <entry>the interpreter that must be used for the script. Supported options are shell and perl. + <para><screen><interpreter>perl</interpreter></screen></para></entry> + <entry>optional (default is shell)</entry> + </row> + <row> + <entry>filename</entry> + <entry>the filename of the script. It will be stored in a temporary directory under /tmp/... + <para><screen><filename>myScript5.sh</filename></screen></para></entry> + <entry>optional. The default is the type of the script (pre-scripts) in this case</entry> + </row> + <row> + <entry>feedback</entry> + <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the + user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so + no confirmation is needed. + <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry> + <entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry> + </row> + <row> + <entry>debug</entry> + <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings + turned on. + <para><screen><debug config:type="boolean">true</debug></screen></para></entry> + <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> + </row> + </tbody> + </tgroup> + </table> + </para> + </section> + + + <section id="chroot.scripts"> <title>Chroot environment scripts</title> <para>Chroot scripts are executed before the machine reboots for the first time. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/doc/examples/example.scripts.xml new/autoyast2-2.18.3/doc/examples/example.scripts.xml --- old/autoyast2-2.18.2/doc/examples/example.scripts.xml 2007-05-21 12:26:33.000000000 +0200 +++ new/autoyast2-2.18.3/doc/examples/example.scripts.xml 2009-04-03 13:07:25.000000000 +0200 @@ -68,5 +68,18 @@ </source> </script> </pre-scripts> + <postpartitioning-scripts config:type="list"> + <script> + <filename>postpart.sh</filename> + <interpreter>shell</interpreter> + <debug config:type="boolean">false</debug> + <feedback config:type="boolean">true</feedback> + <source><![CDATA[ +touch /mnt/testfile +echo Hi +]]> + </source> + </script> + </postpartitioning-scripts> </scripts> </profile> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/clients/ayast_setup.ycp new/autoyast2-2.18.3/src/clients/ayast_setup.ycp --- old/autoyast2-2.18.2/src/clients/ayast_setup.ycp 2009-01-09 14:48:55.000000000 +0100 +++ new/autoyast2-2.18.3/src/clients/ayast_setup.ycp 2009-05-04 14:29:04.000000000 +0200 @@ -11,7 +11,7 @@ 0.5: * support for the new "keep install network" feature of 10.3 * Version: 0.5 - * $Id$ + * $Id: ayast_setup.ycp 57028 2009-04-29 10:58:09Z lslezak $ this client can be called from a running system, to do the autoyast configuration. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/clients/clone_system.ycp new/autoyast2-2.18.3/src/clients/clone_system.ycp --- old/autoyast2-2.18.2/src/clients/clone_system.ycp 2007-05-21 12:26:34.000000000 +0200 +++ new/autoyast2-2.18.3/src/clients/clone_system.ycp 2009-05-04 14:29:04.000000000 +0200 @@ -6,7 +6,7 @@ * system. * * Changes: * initial - just do a simple clone - * $Id$ + * $Id: clone_system.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/clients/inst_autoconfigure.ycp new/autoyast2-2.18.3/src/clients/inst_autoconfigure.ycp --- old/autoyast2-2.18.2/src/clients/inst_autoconfigure.ycp 2008-10-28 17:29:17.000000000 +0100 +++ new/autoyast2-2.18.3/src/clients/inst_autoconfigure.ycp 2009-05-04 11:54:37.000000000 +0200 @@ -5,7 +5,7 @@ * Summary: This module finishes auto-installation and configures * the system as described in the profile file. * - * $Id: inst_autoconfigure.ycp 52637 2008-10-28 16:29:45Z ug $ + * $Id: inst_autoconfigure.ycp 57049 2009-05-04 09:54:36Z ug $ */ { @@ -161,7 +161,12 @@ result[res] = Profile::current[res]:[]; i = i + 1; }); - y2milestone("Calling auto client with: %1", result); + if( d["X-SuSE-YaST-AutoLogResource"]:"true" == "true" ) { + y2milestone("Calling auto client with: %1", result); + } else { + y2milestone("logging for resource %1 turned off",resource); + y2debug("Calling auto client with: %1", result); + } if (size(result) > 0 ) logStep( sformat (_("Configuring %1"), p)); else @@ -174,7 +179,12 @@ } else if (d["X-SuSE-YaST-AutoInstDataType"]:"map" == "map") { - y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + if( d["X-SuSE-YaST-AutoLogResource"]:"true" == "true" ) { + y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } else { + y2milestone("logging for resource %1 turned off",resource); + y2debug("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } if (size(Profile::current[resource]:$[]) > 0 ) logStep( sformat (_("Configuring %1"), p)); else @@ -190,8 +200,12 @@ logStep( sformat (_("Configuring %1"), p)); else logStep( sformat (_("Not Configuring %1"), p)); - - y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:[])); + if( d["X-SuSE-YaST-AutoLogResource"]:"true" == "true" ) { + y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } else { + y2milestone("logging for resource %1 turned off",resource); + y2debug("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } //Call::Function(module_auto, ["Import", eval(Profile::current[resource]:[]) ]); processWait( resource, "pre-modules" ); Call::Function(module_auto, ["Write"]); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/clients/inst_autoimage.ycp new/autoyast2-2.18.3/src/clients/inst_autoimage.ycp --- old/autoyast2-2.18.2/src/clients/inst_autoimage.ycp 2007-05-21 12:26:34.000000000 +0200 +++ new/autoyast2-2.18.3/src/clients/inst_autoimage.ycp 2009-04-03 13:09:24.000000000 +0200 @@ -4,7 +4,7 @@ * Author: Anas Nashif <nashif(a)suse.de> * Summary: Imaging * - * $Id: inst_autoimage.ycp 33269 2006-10-09 08:22:24Z ug $ + * $Id: inst_autoimage.ycp 56615 2009-04-03 11:08:57Z ug $ */ { @@ -16,6 +16,9 @@ import "Report"; import "AutoinstImage"; import "AutoinstSoftware"; +import "AutoinstScripts"; + +AutoinstScripts::Write("postpartitioning-scripts", false); if (!AutoinstSoftware::imaging) return `auto; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/dialogs/ask.ycp new/autoyast2-2.18.3/src/dialogs/ask.ycp --- old/autoyast2-2.18.2/src/dialogs/ask.ycp 2009-01-26 14:29:59.000000000 +0100 +++ new/autoyast2-2.18.3/src/dialogs/ask.ycp 2009-05-04 14:29:04.000000000 +0200 @@ -5,7 +5,7 @@ * Summary: ask for some values in the profile * * Changes: - * $Id$ + * $Id: ask.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/include/autopart.ycp new/autoyast2-2.18.3/src/include/autopart.ycp --- old/autoyast2-2.18.2/src/include/autopart.ycp 2009-03-31 14:54:22.000000000 +0200 +++ new/autoyast2-2.18.3/src/include/autopart.ycp 2009-05-04 14:29:04.000000000 +0200 @@ -1,7 +1,7 @@ /* -$Id: autopart.ycp 56495 2009-03-31 12:54:01Z ug $ +$Id: autopart.ycp 57051 2009-05-04 12:25:37Z aschnell $ */ { textdomain "autoinst"; @@ -37,7 +37,7 @@ !p["format"]:false && !Partitions::IsLinuxPartition(p["fsid"]:0)) ); - l = filter(map p, l, ``(!contains( [`xfs, `ext2, `ext3, `jfs, `reiser], + l = filter(map p, l, ``(!contains( [`xfs, `ext2, `ext3, `ext4, `jfs, `reiser], p["used_fs"]:`unknown))); l = filter(map p, l, ``(!FileSystems::IsSystemMp( p["mount"]:"", false ))); @@ -402,7 +402,8 @@ integer index = 0; integer pindex = e["added",0,0]:0; string mount = solution["partitions",pindex,"mount"]:""; - integer fsid = Partitions::fsid_native; +// integer fsid = Partitions::fsid_native; + integer fsid = disk["partitions",pindex,"fsid"]:Partitions::fsid_native; if( mount == "swap" ) { fsid = Partitions::fsid_swap; @@ -421,7 +422,7 @@ p["region"] = solution["partitions",pindex,"region"]:[]; } p["mount"] = mount; - if (e["reuse"]:false) + if (e["reuse"]:false) p["used_fs"] = solution["partitions",pindex,"filesystem"]:p["detected_fs"]:`ext3; else p["used_fs"] = solution["partitions",pindex,"filesystem"]:`ext3; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/modules/AutoinstScripts.ycp new/autoyast2-2.18.3/src/modules/AutoinstScripts.ycp --- old/autoyast2-2.18.2/src/modules/AutoinstScripts.ycp 2008-09-08 13:15:07.000000000 +0200 +++ new/autoyast2-2.18.3/src/modules/AutoinstScripts.ycp 2009-04-03 13:26:53.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Custom scripts * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: AutoinstScripts.ycp 50794 2008-09-08 11:16:42Z ug $ + * $Id: AutoinstScripts.ycp 56616 2009-04-03 11:26:27Z ug $ */ { @@ -33,6 +33,10 @@ /* Init scripts */ global list<map> init = []; + /* postpart scripts */ + global list<map> postpart = []; + + /* Merged scripts */ global list<map> merged = []; @@ -89,6 +93,12 @@ return p; }) ); + result = (list<map>)union(result, maplist (map p, postpart, + ``{ + p = add(p,"type","postpartitioning-scripts"); + return p; + }) + ); return result; } @@ -115,6 +125,7 @@ post = []; chroot = []; init = []; + postpart = []; y2milestone("Merged %1", merged); // split @@ -127,6 +138,8 @@ init = add(init,s); else if (s["type"]:"" == "chroot-scripts") chroot = add(chroot,s); + else if (s["type"]:"" == "postpartitioning-scripts") + postpart = add(postpart,s); }); @@ -168,6 +181,16 @@ "debug":p["debug"]:true ]); }); + list<map> expostpart = maplist (map p, postpart, ``{ + return ($["filename":p["filename"]:"", + "interpreter": p["interpreter"]:"", + "source":p["source"]:"", + "location":p["location"]:"", + "feedback":p["feedback"]:false, + "debug":p["debug"]:true + ]); + }); + map<string, list> result = $[]; if (size(expre) > 0 ) result["pre-scripts"] = expre; @@ -177,6 +200,8 @@ result["chroot-scripts"] = exchroot; if (size(exinit) > 0 ) result["init-scripts"] = exinit; + if (size(expostpart) > 0 ) + result["postpartitioning-scripts"] = expostpart; return result; @@ -220,11 +245,13 @@ init = s["init-scripts"]:[]; post = s["post-scripts"]:[]; chroot = s["chroot-scripts"]:[]; + postpart = s["postpartitioning-scripts"]:[]; pre = Resolve_relurl(pre); init = Resolve_relurl(init); post = Resolve_relurl(post); chroot = Resolve_relurl(chroot); + postpart = Resolve_relurl(postpart); merged = mergeScripts(); y2debug("merged: %1", merged); @@ -290,6 +317,19 @@ { summary = Summary::AddLine(summary, Summary::NotConfigured()); } + summary = Summary::AddHeader(summary, _("Postpartitioning Scripts")); + if (size( postpart ) > 0 ) + { + summary = Summary::OpenList(summary); + foreach(map script, postpart, ``{ + summary = Summary::AddListItem(summary, script["filename"]:"" ); + }); + summary = Summary::CloseList(summary); + } + else + { + summary = Summary::AddLine(summary, Summary::NotConfigured()); + } return summary; } @@ -388,6 +428,10 @@ { return _("Chroot"); } + else if (type == "postpartitioning-scripts") + { + return _("Postpartitioning"); + } return _("Unknown"); } @@ -549,6 +593,10 @@ { scripts = filter(map s, post, ``(s["network_needed"]:false)); } + else if (type == "postpartitioning-scripts" ) + { + scripts = postpart; + } else { y2error("Unsupported script type"); @@ -559,7 +607,7 @@ string tmpdirString = ""; string current_logdir = ""; - if (type == "pre-scripts") + if (type == "pre-scripts" || type == "postpartitioning-scripts") { tmpdirString = sformat("%1/%2", AutoinstConfig::tmpDir, type); SCR::Execute (.target.mkdir, tmpdirString); @@ -600,12 +648,12 @@ } string scriptPath = ""; - if (type == "pre-scripts") + if ( type == "pre-scripts" || type == "postpartitioning-scripts" ) { // y2milestone("doing /sbin/udevcontrol stop_exec_queue now to prevent trouble if one is doing partitioning in a pre-script"); // SCR::Execute( .target.bash, "/sbin/udevcontrol stop_exec_queue" ); scriptPath = sformat("%1/%2/%3", AutoinstConfig::tmpDir, type, scriptName); - y2milestone("Writing pre script into %1", scriptPath); + y2milestone("Writing %1 script into %2", type, scriptPath); if (s["location"]:"" != "") { y2debug("getting script: %1", s["location"]:"" ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/modules/Profile.ycp new/autoyast2-2.18.3/src/modules/Profile.ycp --- old/autoyast2-2.18.2/src/modules/Profile.ycp 2009-02-25 17:16:34.000000000 +0100 +++ new/autoyast2-2.18.3/src/modules/Profile.ycp 2009-04-08 14:23:27.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Profile handling * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Profile.ycp 55752 2009-02-25 16:16:34Z ug $ + * $Id: Profile.ycp 56688 2009-04-08 12:22:51Z ug $ */ { module "Profile"; @@ -611,7 +611,7 @@ m[i] = setLValue( tmp, v, m[i]:[] ); } } else { - y2milestone("setting %1 to %2",i,v); + y2debug("setting %1 to %2",i,v); m[i] = v; } return m; @@ -627,7 +627,7 @@ m[i] = setLValue( tmp, v, m[i]:[] ); } } else { - y2milestone("setting %1 to %2",i,v); + y2debug("setting %1 to %2",i,v); m[i] = v; } return m; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/modules/Y2ModuleConfig.ycp new/autoyast2-2.18.3/src/modules/Y2ModuleConfig.ycp --- old/autoyast2-2.18.2/src/modules/Y2ModuleConfig.ycp 2009-02-06 14:23:17.000000000 +0100 +++ new/autoyast2-2.18.3/src/modules/Y2ModuleConfig.ycp 2009-05-04 11:54:37.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Read data from desktop files * Author: Anas Nashif <nashif(a)suse.de> * - * $Id: Y2ModuleConfig.ycp 55301 2009-02-06 13:23:16Z ug $ + * $Id: Y2ModuleConfig.ycp 57049 2009-05-04 09:54:36Z ug $ */ { @@ -52,7 +52,8 @@ "X-SuSE-YaST-AutoInstDataType", "X-SuSE-YaST-AutoInstClonable", "X-SuSE-YaST-AutoInstRequires", - "X-SuSE-DocTeamID" + "X-SuSE-DocTeamID", + "X-SuSE-YaST-AutoLogResource" ]; Desktop::Read(Values); map<string,map> configurations = Desktop::Modules; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/schema/classes-use.rnc new/autoyast2-2.18.3/src/schema/classes-use.rnc --- old/autoyast2-2.18.2/src/schema/classes-use.rnc 2007-05-21 12:26:33.000000000 +0200 +++ new/autoyast2-2.18.3/src/schema/classes-use.rnc 2009-04-08 12:10:50.000000000 +0200 @@ -15,7 +15,11 @@ class = element class { class_name & - configuration + configuration & + element dont_merge { + LIST, + element element { text }* + }? } class_name = diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/src/schema/rules.rnc new/autoyast2-2.18.3/src/schema/rules.rnc --- old/autoyast2-2.18.2/src/schema/rules.rnc 2007-05-21 12:26:33.000000000 +0200 +++ new/autoyast2-2.18.3/src/schema/rules.rnc 2009-04-08 12:09:51.000000000 +0200 @@ -89,6 +89,10 @@ result = element result { profile & + element dont_merge { + LIST, + element element { text }* + }? & continue? } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.18.2/VERSION new/autoyast2-2.18.3/VERSION --- old/autoyast2-2.18.2/VERSION 2009-04-02 15:47:20.000000000 +0200 +++ new/autoyast2-2.18.3/VERSION 2009-05-05 12:39:14.000000000 +0200 @@ -1 +1 @@ -2.18.2 +2.18.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠Hilbert.suse.de 08 May '09

08 May '09

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at Fri May 8 10:26:20 CEST 2009. -------- --- yast2-bootloader/yast2-bootloader.changes 2009-04-15 11:34:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2009-05-07 14:35:04.000000000 +0200 @@ -1,0 +2,31 @@ +Thu May 7 10:05:02 CEST 2009 - juhliarik(a)suse.cz + +- added fix for checking soft-raid devices in device.map + (bnc#494630) +- added fix for changing device map in y2-bootloader (bnc#497944) +- 2.18.7 + +------------------------------------------------------------------- +Tue Apr 28 16:48:12 CEST 2009 - juhliarik(a)suse.cz + +- added updated patch from IBM and reipl (bnc#471522) + +------------------------------------------------------------------- +Tue Apr 28 16:37:43 CEST 2009 - juhliarik(a)suse.cz + +- disable checking thinkpad sequence in MBR also save content of + MBR (bnc#464485) + +------------------------------------------------------------------- +Wed Apr 22 15:47:26 CEST 2009 - jreidinger(a)suse.cz + +- code clean +- add interface for new perl-Bootloader MBR tools +- add missing short-cuts for widgets + +------------------------------------------------------------------- +Thu Apr 16 14:52:23 CEST 2009 - juhliarik(a)suse.cz + +- added fix for commandline interface (bnc#479069) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-bootloader-2.18.6.tar.bz2 New: ---- yast2-bootloader-2.18.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.H28573/_old 2009-05-08 10:25:53.000000000 +0200 +++ /var/tmp/diff_new_pack.H28573/_new 2009-05-08 10:25:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.18.6) +# spec file for package yast2-bootloader (Version 2.18.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-bootloader -Version: 2.18.6 +Version: 2.18.7 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.18.6.tar.bz2 +Source0: yast2-bootloader-2.18.7.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -34,12 +34,14 @@ Requires: yast2 >= 2.18.14 Requires: yast2-packager >= 2.17.24 Requires: yast2-pkg-bindings >= 2.17.25 -Requires: perl-Bootloader >= 0.4.80 -Requires: yast2-core yast2-storage perl-Bootloader parted perl-Compress-Zlib limal-perl +Requires: perl-Bootloader >= 0.5.0 +Requires: yast2-core >= 2.18.7 +Requires: yast2-storage parted perl-Compress-Zlib limal-perl BuildRequires: yast2 >= 2.18.14 BuildRequires: yast2-packager >= 2.17.24 BuildRequires: yast2-pkg-bindings >= 2.17.25 -BuildRequires: perl-Bootloader >= 0.4.91 +BuildRequires: perl-Bootloader >= 0.5.0 +BuildRequires: yast2-core >= 2.18.6 %ifarch %ix86 x86_64 Requires: master-boot-code %endif @@ -68,7 +70,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.18.6 +%setup -n yast2-bootloader-2.18.7 %build %{prefix}/bin/y2tool y2autoconf @@ -114,6 +116,22 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Thu May 07 2009 juhliarik(a)suse.cz +- added fix for checking soft-raid devices in device.map + (bnc#494630) +- added fix for changing device map in y2-bootloader (bnc#497944) +- 2.18.7 +* Tue Apr 28 2009 juhliarik(a)suse.cz +- added updated patch from IBM and reipl (bnc#471522) +* Tue Apr 28 2009 juhliarik(a)suse.cz +- disable checking thinkpad sequence in MBR also save content of + MBR (bnc#464485) +* Wed Apr 22 2009 jreidinger(a)suse.cz +- code clean +- add interface for new perl-Bootloader MBR tools +- add missing short-cuts for widgets +* Thu Apr 16 2009 juhliarik(a)suse.cz +- added fix for commandline interface (bnc#479069) * Wed Apr 15 2009 juhliarik(a)suse.cz - added back function setKernelParam (bnc#495048) - 2.18.6 ++++++ yast2-bootloader-2.18.6.tar.bz2 -> yast2-bootloader-2.18.7.tar.bz2 ++++++ ++++ 5328 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit desktop-data-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 07 May '09

07 May '09

Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at Fri May 8 00:31:57 CEST 2009. -------- --- desktop-data-openSUSE/desktop-data-openSUSE.changes 2009-05-06 18:21:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes 2009-05-07 10:12:58.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 7 10:08:29 CEST 2009 - coolo(a)suse.de + +- remove it also from file list + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-data-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.k28146/_old 2009-05-08 00:31:22.000000000 +0200 +++ /var/tmp/diff_new_pack.k28146/_new 2009-05-08 00:31:22.000000000 +0200 @@ -21,7 +21,7 @@ Name: desktop-data-openSUSE BuildRequires: hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu xdg-utils Version: 11.2 -Release: 2 +Release: 3 Summary: SUSE Theme Files for KDE and GNOME License: GPL v2 or later Group: System/GUI/Other @@ -188,10 +188,6 @@ /usr/bin/desktop-launch /etc/skel/Documents /etc/skel/public_html -%dir /opt/kde3 -%dir /opt/kde3/share -%dir /opt/kde3/share/apps -/opt/kde3/share/apps/kdm %dir /etc/kde4 %dir /etc/kde4/kdm %config /etc/kde4/kdm/backgroundrc @@ -208,6 +204,8 @@ %dir /usr/share/gnome-background-properties %changelog +* Thu May 07 2009 coolo(a)suse.de +- remove it also from file list * Wed May 06 2009 llunak(a)suse.cz - remove /opt/kde3 * Thu Feb 05 2009 stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop aufs from openSUSE:Factory
by root＠Hilbert.suse.de 07 May '09

07 May '09

Hello community, FYI: Package aufs was dropped from openSUSE:Factory at Fri May 8 00:09:06 CEST 2009. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=au… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monsoon for openSUSE:Factory
by root＠Hilbert.suse.de 07 May '09

07 May '09

Hello community, here is the log from the commit of package monsoon for openSUSE:Factory checked in at Fri May 8 00:06:26 CEST 2009. -------- --- GNOME/monsoon/monsoon.changes 2008-07-09 16:44:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/monsoon/monsoon.changes 2009-03-02 23:21:33.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 2 13:55:43 MST 2009 - ajorgensen(a)novell.com + +- Update to version 0.20: + + http://www.monsoon-project.org/jaws/index.php?page/releasenotes0.20 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- monsoon-0.15.tar.bz2 New: ---- monsoon-0.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monsoon.spec ++++++ --- /var/tmp/diff_new_pack.El3758/_old 2009-05-08 00:06:15.000000000 +0200 +++ /var/tmp/diff_new_pack.El3758/_new 2009-05-08 00:06:15.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package monsoon (Version 0.15) +# spec file for package monsoon (Version 0.20) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,7 +20,7 @@ Name: monsoon Summary: A GTK# based bittorrent GUI based on the Monsoon library -Version: 0.15 +Version: 0.20 Release: 1 License: X11/MIT Group: Productivity/Networking/Other @@ -23,6 +30,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://monotorrent.blogspot.com/ BuildRequires: gconf-sharp2 glade-sharp2 gnome-sharp2 gnome-vfs-sharp2 gtk-sharp2 intltool mono mono-devel ndesk-dbus ndesk-dbus-glib-devel pkg-config update-desktop-files +BuildRequires: mono-nat monotorrent Requires: mono-core ndesk-dbus ndesk-dbus-glib Requires: %{name}-lang = %{version} #Force files to use /lib and not /lib64 @@ -64,6 +72,9 @@ %files lang -f %{name}.lang %changelog +* Mon Mar 02 2009 ajorgensen(a)novell.com +- Update to version 0.20: + + http://www.monsoon-project.org/jaws/index.php?page/releasenotes0.20 * Wed Jul 09 2008 rodrigo(a)suse.de - Update to version 0.15: + http://www.monsoon-project.org/jaws/index.php?page/releasenotes0.15 @@ -72,13 +83,13 @@ - Add monsoon-nat-fix.patch (bnc#388348). * Fri May 09 2008 maw(a)suse.de - Update bug-386548_torrentLoad.patch (bnc#386548). -* Thu May 08 2008 maw(a)suse.de +* Wed May 07 2008 maw(a)suse.de - Add bug-386548_torrentLoad.patch (bnc#386548). * Wed Apr 23 2008 vuntz(a)suse.de - Merge from the build service: + new version (0.11.3) + add mono-devel buildrequires -* Tue Apr 15 2008 maw(a)suse.de +* Mon Apr 14 2008 maw(a)suse.de - Merge changes from the build service. * Mon Apr 14 2008 awafaa(a)opensuse.org - New version (0.11.2). ++++++ monsoon-0.15.tar.bz2 -> monsoon-0.20.tar.bz2 ++++++ ++++ 66405 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hdf5 for openSUSE:Factory
by root＠Hilbert.suse.de 07 May '09

07 May '09

Hello community, here is the log from the commit of package hdf5 for openSUSE:Factory checked in at Fri May 8 00:03:33 CEST 2009. -------- --- hdf5/hdf5.changes 2009-03-02 17:01:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/hdf5/hdf5.changes 2009-05-07 20:03:04.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 7 19:40:59 CEST 2009 - pgajdos(a)suse.cz + +- fixed build with new gcc, see [bnc#501751] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- hdf5-1.8.2-gcc44-O3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf5.spec ++++++ --- /var/tmp/diff_new_pack.l26438/_old 2009-05-08 00:03:00.000000000 +0200 +++ /var/tmp/diff_new_pack.l26438/_new 2009-05-08 00:03:00.000000000 +0200 @@ -20,7 +20,7 @@ Name: hdf5 Version: 1.8.2 -Release: 2 +Release: 3 Summary: Hierarchical Data File Format Version 5 License: Apache-like Group: Development/Libraries/Parallel @@ -31,6 +31,7 @@ Patch3: %{name}-%{version}-build.patch Patch4: %{name}-%{version}-noreturn.patch Patch5: %{name}-%{version}-lib64.patch +Patch6: %{name}-%{version}-gcc44-O3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: On BuildRequires: fdupes gcc-c++ gcc-fortran krb5-devel openssl-devel zlib-devel @@ -111,9 +112,10 @@ %patch3 %patch4 %patch5 +%patch6 %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CPPFLAGS="$RPM_OPT_FLAGS" export F9X=gfortran CXX=g++ %configure --with-ssl --enable-cxx --enable-fortran \ @@ -183,6 +185,8 @@ %{_libdir}/gfortran/modules/*.mod %changelog +* Thu May 07 2009 pgajdos(a)suse.cz +- fixed build with new gcc, see [bnc#501751] * Mon Mar 02 2009 crrodriguez(a)suse.de - save 9MB removing static libraries * Tue Jan 13 2009 pgajdos(a)suse.cz ++++++ hdf5-1.8.2-gcc44-O3.patch ++++++ --- config/gnu-flags +++ config/gnu-flags @@ -155,7 +155,7 @@ ;; gcc-4*) # Be optimistic about future versions of gcc.. :-) - QAK - 2003/10/20 - PROD_CFLAGS="-O3" + PROD_CFLAGS="" ;; *) PROD_CFLAGS="-O" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit quagga for openSUSE:Factory
by root＠Hilbert.suse.de 07 May '09

07 May '09

Hello community, here is the log from the commit of package quagga for openSUSE:Factory checked in at Thu May 7 17:50:03 CEST 2009. -------- --- quagga/quagga.changes 2009-01-19 14:13:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/quagga/quagga.changes 2009-05-07 14:17:32.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 7 14:16:16 CEST 2009 - prusnak(a)suse.cz + +- fixed crash (DoS) in BGP daemon via an ASN elements + (bgpd-asn-dos.patch) [bnc#500540] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- quagga-0.99.11-bgpd-asn-dos.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quagga.spec ++++++ --- /var/tmp/diff_new_pack.hq6810/_old 2009-05-07 17:48:41.000000000 +0200 +++ /var/tmp/diff_new_pack.hq6810/_new 2009-05-07 17:48:41.000000000 +0200 @@ -21,7 +21,7 @@ Name: quagga BuildRequires: net-snmp-devel pam-devel readline-devel Version: 0.99.11 -Release: 1 +Release: 2 PreReq: %insserv_prereq %fillup_prereq PreReq: %install_info_prereq # pwdutils for useradd and groupadd @@ -35,7 +35,8 @@ Summary: Free Routing Software (for BGP, OSPF and RIP, for example) Source: %{name}-%{version}.tar.bz2 Source1: %{name}-SUSE.tar.bz2 -Source2: quagga.pam +Source2: %{name}.pam +Patch0: %{name}-%{version}-bgpd-asn-dos.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -84,6 +85,7 @@ %prep %setup -q -a 1 +%patch0 %build if ! ls /proc/net/{dev,route,snmp} >/dev/null; then @@ -177,6 +179,9 @@ %{_includedir}/%{name}/ospfd/*.h %changelog +* Thu May 07 2009 prusnak(a)suse.cz +- fixed crash (DoS) in BGP daemon via an ASN elements + (bgpd-asn-dos.patch) [bnc#500540] * Mon Jan 19 2009 prusnak(a)suse.cz - updated to 0.99.11 * bgpd: ++++++ quagga-0.99.11-bgpd-asn-dos.patch ++++++ --- bgpd/bgp_aspath.c +++ bgpd/bgp_aspath.c @@ -393,25 +393,6 @@ aspath_delimiter_char (u_char type, u_ch return ' '; } -/* countup asns from this segment and index onward */ -static int -assegment_count_asns (struct assegment *seg, int from) -{ - int count = 0; - while (seg) - { - if (!from) - count += seg->length; - else - { - count += (seg->length - from); - from = 0; - } - seg = seg->next; - } - return count; -} - unsigned int aspath_count_confeds (struct aspath *aspath) { @@ -521,6 +502,21 @@ aspath_count_numas (struct aspath *aspat return num; } +static void +aspath_make_str_big_enough (int len, + char **str_buf, + int *str_size, + int count_to_be_added) +{ +#define TERMINATOR 1 + while (len + count_to_be_added + TERMINATOR > *str_size) + { + *str_size *= 2; + *str_buf = XREALLOC (MTYPE_AS_STR, *str_buf, *str_size); + } +#undef TERMINATOR +} + /* Convert aspath structure to string expression. */ static char * aspath_make_str_count (struct aspath *as) @@ -540,18 +536,7 @@ aspath_make_str_count (struct aspath *as seg = as->segments; - /* ASN takes 5 chars at least, plus seperator, see below. - * If there is one differing segment type, we need an additional - * 2 chars for segment delimiters, and the final '\0'. - * Hopefully this is large enough to avoid hitting the realloc - * code below for most common sequences. - * - * With 32bit ASNs, this range will increase, but only worth changing - * once there are significant numbers of ASN >= 100000 - */ -#define ASN_STR_LEN (5 + 1) - str_size = MAX (assegment_count_asns (seg, 0) * ASN_STR_LEN + 2 + 1, - ASPATH_STR_DEFAULT_LEN); + str_size = ASPATH_STR_DEFAULT_LEN; str_buf = XMALLOC (MTYPE_AS_STR, str_size); while (seg) @@ -575,32 +560,24 @@ aspath_make_str_count (struct aspath *as return NULL; } - /* We might need to increase str_buf, particularly if path has - * differing segments types, our initial guesstimate above will - * have been wrong. need 5 chars for ASN, a seperator each and - * potentially two segment delimiters, plus a space between each - * segment and trailing zero. - * - * This may need to revised if/when significant numbers of - * ASNs >= 100000 are assigned and in-use on the internet... - */ -#define SEGMENT_STR_LEN(X) (((X)->length * ASN_STR_LEN) + 2 + 1 + 1) - if ( (len + SEGMENT_STR_LEN(seg)) > str_size) - { - str_size = len + SEGMENT_STR_LEN(seg); - str_buf = XREALLOC (MTYPE_AS_STR, str_buf, str_size); - } -#undef ASN_STR_LEN -#undef SEGMENT_STR_LEN - if (seg->type != AS_SEQUENCE) - len += snprintf (str_buf + len, str_size - len, - "%c", - aspath_delimiter_char (seg->type, AS_SEG_START)); + { + aspath_make_str_big_enough (len, &str_buf, &str_size, 1); /* %c */ + len += snprintf (str_buf + len, str_size - len, + "%c", + aspath_delimiter_char (seg->type, AS_SEG_START)); + } /* write out the ASNs, with their seperators, bar the last one*/ for (i = 0; i < seg->length; i++) { +#define APPROX_DIG_CNT(x) (x < 100000U ? 5 : 10) + /* %u + %c + %c + " " (last two are below loop) */ + aspath_make_str_big_enough (len, + &str_buf, + &str_size, + APPROX_DIG_CNT(seg->as[i]) + 1 + 1 + 1); + len += snprintf (str_buf + len, str_size - len, "%u", seg->as[i]); if (i < (seg->length - 1)) @@ -1771,8 +1748,9 @@ aspath_key_make (void *p) static int aspath_cmp (const void *arg1, const void *arg2) { - const struct assegment *seg1 = ((struct aspath *)arg1)->segments; - const struct assegment *seg2 = ((struct aspath *)arg2)->segments; + const struct assegment *seg1 = ((const struct aspath *)arg1)->segments; + const struct assegment *seg2 = ((const struct aspath *)arg2)->segments; + while (seg1 || seg2) { --- bgpd/bgp_attr.c +++ bgpd/bgp_attr.c @@ -857,7 +857,7 @@ static int bgp_attr_aspath_check( struct && ! aspath_firstas_check (attr->aspath, peer->as)) { zlog (peer->log, LOG_ERR, - "%s incorrect first AS (must be %d)", peer->host, peer->as); + "%s incorrect first AS (must be %u)", peer->host, peer->as); bgp_notify_send (peer, BGP_NOTIFY_UPDATE_ERR, BGP_NOTIFY_UPDATE_MAL_AS_PATH); --- bgpd/bgp_community.c +++ bgpd/bgp_community.c @@ -282,7 +282,7 @@ community_com2str (struct community *co default: as = (comval >> 16) & 0xFFFF; val = comval & 0xFFFF; - sprintf (pnt, "%d:%d", as, val); + sprintf (pnt, "%u:%d", as, val); pnt += strlen (pnt); break; } --- bgpd/bgpd.c +++ bgpd/bgpd.c @@ -4512,13 +4512,13 @@ bgp_config_write_peer (struct vty *vty, vty_out (vty, " neighbor %s peer-group%s", addr, VTY_NEWLINE); if (peer->as) - vty_out (vty, " neighbor %s remote-as %d%s", addr, peer->as, + vty_out (vty, " neighbor %s remote-as %u%s", addr, peer->as, VTY_NEWLINE); } else { if (! g_peer->as) - vty_out (vty, " neighbor %s remote-as %d%s", addr, peer->as, + vty_out (vty, " neighbor %s remote-as %u%s", addr, peer->as, VTY_NEWLINE); if (peer->af_group[AFI_IP][SAFI_UNICAST]) vty_out (vty, " neighbor %s peer-group %s%s", addr, @@ -4528,7 +4528,7 @@ bgp_config_write_peer (struct vty *vty, /* local-as. */ if (peer->change_local_as) if (! peer_group_active (peer)) - vty_out (vty, " neighbor %s local-as %d%s%s", addr, + vty_out (vty, " neighbor %s local-as %u%s%s", addr, peer->change_local_as, CHECK_FLAG (peer->flags, PEER_FLAG_LOCAL_AS_NO_PREPEND) ? " no-prepend" : "", VTY_NEWLINE); @@ -4917,7 +4917,7 @@ bgp_config_write (struct vty *vty) vty_out (vty, "!%s", VTY_NEWLINE); /* Router bgp ASN */ - vty_out (vty, "router bgp %d", bgp->as); + vty_out (vty, "router bgp %u", bgp->as); if (bgp_option_check (BGP_OPT_MULTIPLE_INSTANCE)) { @@ -4978,7 +4978,7 @@ bgp_config_write (struct vty *vty) vty_out (vty, " bgp confederation peers"); for (i = 0; i < bgp->confed_peers_cnt; i++) - vty_out(vty, " %d", bgp->confed_peers[i]); + vty_out(vty, " %u", bgp->confed_peers[i]); vty_out (vty, "%s", VTY_NEWLINE); } --- bgpd/bgp_debug.c +++ bgpd/bgp_debug.c @@ -205,7 +205,7 @@ bgp_dump_attr (struct peer *peer, struct snprintf (buf + strlen (buf), size - strlen (buf), ", atomic-aggregate"); if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_AGGREGATOR))) - snprintf (buf + strlen (buf), size - strlen (buf), ", aggregated by %d %s", + snprintf (buf + strlen (buf), size - strlen (buf), ", aggregated by %u %s", attr->extra->aggregator_as, inet_ntoa (attr->extra->aggregator_addr)); --- bgpd/bgp_ecommunity.c +++ bgpd/bgp_ecommunity.c @@ -673,7 +673,7 @@ ecommunity_ecom2str (struct ecommunity * eas.val = (*pnt++ << 8); eas.val |= (*pnt++); - len = sprintf( str_buf + str_pnt, "%s%d:%d", prefix, + len = sprintf( str_buf + str_pnt, "%s%u:%d", prefix, eas.as, eas.val ); str_pnt += len; first = 0; @@ -688,7 +688,7 @@ ecommunity_ecom2str (struct ecommunity * eas.val |= (*pnt++ << 8); eas.val |= (*pnt++); - len = sprintf (str_buf + str_pnt, "%s%d:%d", prefix, + len = sprintf (str_buf + str_pnt, "%s%u:%d", prefix, eas.as, eas.val); str_pnt += len; first = 0; --- bgpd/bgp_mplsvpn.c +++ bgpd/bgp_mplsvpn.c @@ -265,7 +265,7 @@ prefix_rd2str (struct prefix_rd *prd, ch if (type == RD_TYPE_AS) { decode_rd_as (pnt + 2, &rd_as); - snprintf (buf, size, "%d:%d", rd_as.as, rd_as.val); + snprintf (buf, size, "%u:%d", rd_as.as, rd_as.val); return buf; } else if (type == RD_TYPE_IP) @@ -371,7 +371,7 @@ show_adj_route_vpn (struct vty *vty, str vty_out (vty, "Route Distinguisher: "); if (type == RD_TYPE_AS) - vty_out (vty, "%d:%d", rd_as.as, rd_as.val); + vty_out (vty, "%u:%d", rd_as.as, rd_as.val); else if (type == RD_TYPE_IP) vty_out (vty, "%s:%d", inet_ntoa (rd_ip.ip), rd_ip.val); @@ -478,7 +478,7 @@ bgp_show_mpls_vpn (struct vty *vty, stru vty_out (vty, "Route Distinguisher: "); if (type == RD_TYPE_AS) - vty_out (vty, "%d:%d", rd_as.as, rd_as.val); + vty_out (vty, "%u:%d", rd_as.as, rd_as.val); else if (type == RD_TYPE_IP) vty_out (vty, "%s:%d", inet_ntoa (rd_ip.ip), rd_ip.val); --- bgpd/bgp_packet.c +++ bgpd/bgp_packet.c @@ -813,7 +813,7 @@ bgp_open_send (struct peer *peer) length = bgp_packet_set_size (s); if (BGP_DEBUG (normal, NORMAL)) - zlog_debug ("%s sending OPEN, version %d, my as %d, holdtime %d, id %s", + zlog_debug ("%s sending OPEN, version %d, my as %u, holdtime %d, id %s", peer->host, BGP_VERSION_4, local_as, send_holdtime, inet_ntoa (peer->local_id)); @@ -1184,7 +1184,7 @@ bgp_open_receive (struct peer *peer, bgp /* Receive OPEN message log */ if (BGP_DEBUG (normal, NORMAL)) - zlog_debug ("%s rcv OPEN, version %d, remote-as (in open) %d," + zlog_debug ("%s rcv OPEN, version %d, remote-as (in open) %u," " holdtime %d, id %s", peer->host, version, remote_as, holdtime, inet_ntoa (remote_id)); @@ -1277,7 +1277,7 @@ bgp_open_receive (struct peer *peer, bgp else { if (BGP_DEBUG (normal, NORMAL)) - zlog_debug ("%s bad OPEN, remote AS is %d, expected %d", + zlog_debug ("%s bad OPEN, remote AS is %u, expected %u", peer->host, remote_as, peer->as); bgp_notify_send_with_data (peer, BGP_NOTIFY_OPEN_ERR, BGP_NOTIFY_OPEN_BAD_PEER_AS, @@ -1430,7 +1430,7 @@ bgp_open_receive (struct peer *peer, bgp if (remote_as != peer->as) { if (BGP_DEBUG (normal, NORMAL)) - zlog_debug ("%s bad OPEN, remote AS is %d, expected %d", + zlog_debug ("%s bad OPEN, remote AS is %u, expected %u", peer->host, remote_as, peer->as); bgp_notify_send_with_data (peer, BGP_NOTIFY_OPEN_ERR, --- bgpd/bgp_route.c +++ bgpd/bgp_route.c @@ -834,7 +834,7 @@ bgp_announce_check (struct bgp_info *ri, { if (BGP_DEBUG (filter, FILTER)) zlog (peer->log, LOG_DEBUG, - "%s [Update:SEND] suppress announcement to peer AS %d is AS path.", + "%s [Update:SEND] suppress announcement to peer AS %u is AS path.", peer->host, peer->as); return 0; } @@ -847,7 +847,7 @@ bgp_announce_check (struct bgp_info *ri, { if (BGP_DEBUG (filter, FILTER)) zlog (peer->log, LOG_DEBUG, - "%s [Update:SEND] suppress announcement to peer AS %d is AS path.", + "%s [Update:SEND] suppress announcement to peer AS %u is AS path.", peer->host, bgp->confed_id); return 0; @@ -1163,7 +1163,7 @@ bgp_announce_check_rsclient (struct bgp_ { if (BGP_DEBUG (filter, FILTER)) zlog (rsclient->log, LOG_DEBUG, - "%s [Update:SEND] suppress announcement to peer AS %d is AS path.", + "%s [Update:SEND] suppress announcement to peer AS %u is AS path.", rsclient->host, rsclient->as); return 0; } @@ -5956,7 +5956,7 @@ route_vty_out_detail (struct vty *vty, s if (CHECK_FLAG (binfo->flags, BGP_INFO_STALE)) vty_out (vty, ", (stale)"); if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_AGGREGATOR))) - vty_out (vty, ", (aggregated by %d %s)", + vty_out (vty, ", (aggregated by %u %s)", attr->extra->aggregator_as, inet_ntoa (attr->extra->aggregator_addr)); if (CHECK_FLAG (binfo->peer->af_flags[afi][safi], PEER_FLAG_REFLECTOR_CLIENT)) --- bgpd/bgp_vty.c +++ bgpd/bgp_vty.c @@ -334,11 +334,11 @@ DEFUN (router_bgp, VTY_NEWLINE); return CMD_WARNING; case BGP_ERR_AS_MISMATCH: - vty_out (vty, "BGP is already running; AS is %d%s", as, VTY_NEWLINE); + vty_out (vty, "BGP is already running; AS is %u%s", as, VTY_NEWLINE); return CMD_WARNING; case BGP_ERR_INSTANCE_MISMATCH: vty_out (vty, "BGP view name and AS number mismatch%s", VTY_NEWLINE); - vty_out (vty, "BGP instance is already running; AS is %d%s", + vty_out (vty, "BGP instance is already running; AS is %u%s", as, VTY_NEWLINE); return CMD_WARNING; } @@ -1280,10 +1280,10 @@ peer_remote_as_vty (struct vty *vty, con switch (ret) { case BGP_ERR_PEER_GROUP_MEMBER: - vty_out (vty, "%% Peer-group AS %d. Cannot configure remote-as for member%s", as, VTY_NEWLINE); + vty_out (vty, "%% Peer-group AS %u. Cannot configure remote-as for member%s", as, VTY_NEWLINE); return CMD_WARNING; case BGP_ERR_PEER_GROUP_PEER_TYPE_DIFFERENT: - vty_out (vty, "%% The AS# can not be changed from %d to %s, peer-group members must be all internal or all external%s", as, as_str, VTY_NEWLINE); + vty_out (vty, "%% The AS# can not be changed from %u to %s, peer-group members must be all internal or all external%s", as, as_str, VTY_NEWLINE); return CMD_WARNING; } return bgp_vty_return (vty, ret); @@ -1601,7 +1601,7 @@ DEFUN (neighbor_set_peer_group, if (ret == BGP_ERR_PEER_GROUP_PEER_TYPE_DIFFERENT) { - vty_out (vty, "%% Peer with AS %d cannot be in this peer-group, members must be all internal or all external%s", as, VTY_NEWLINE); + vty_out (vty, "%% Peer with AS %u cannot be in this peer-group, members must be all internal or all external%s", as, VTY_NEWLINE); return CMD_WARNING; } @@ -6669,7 +6669,7 @@ bgp_show_summary (struct vty *vty, struc /* Usage summary and header */ vty_out (vty, - "BGP router identifier %s, local AS number %d%s", + "BGP router identifier %s, local AS number %u%s", inet_ntoa (bgp->router_id), bgp->as, VTY_NEWLINE); ents = bgp_table_count (bgp->rib[afi][safi]); @@ -6716,7 +6716,7 @@ bgp_show_summary (struct vty *vty, struc vty_out (vty, "4 "); - vty_out (vty, "%5d %7d %7d %8d %4d %4lu ", + vty_out (vty, "%5u %7d %7d %8d %4d %4lu ", peer->as, peer->open_in + peer->update_in + peer->keepalive_in + peer->notify_in + peer->refresh_in + peer->dynamic_cap_in, @@ -7226,8 +7226,8 @@ bgp_show_peer (struct vty *vty, struct p /* Configured IP address. */ vty_out (vty, "BGP neighbor is %s, ", p->host); - vty_out (vty, "remote AS %d, ", p->as); - vty_out (vty, "local AS %d%s, ", + vty_out (vty, "remote AS %u, ", p->as); + vty_out (vty, "local AS %u%s, ", p->change_local_as ? p->change_local_as : p->local_as, CHECK_FLAG (p->flags, PEER_FLAG_LOCAL_AS_NO_PREPEND) ? " no-prepend" : ""); @@ -8009,7 +8009,7 @@ bgp_show_rsclient_summary (struct vty *v "Route Server's BGP router identifier %s%s", inet_ntoa (bgp->router_id), VTY_NEWLINE); vty_out (vty, - "Route Server's local AS number %d%s", bgp->as, + "Route Server's local AS number %u%s", bgp->as, VTY_NEWLINE); vty_out (vty, "%s", VTY_NEWLINE); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-live-installer for openSUSE:Factory
by root＠Hilbert.suse.de 07 May '09

07 May '09

Hello community, here is the log from the commit of package yast2-live-installer for openSUSE:Factory checked in at Thu May 7 17:47:45 CEST 2009. -------- --- yast2-live-installer/yast2-live-installer.changes 2009-01-12 18:01:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-live-installer/yast2-live-installer.changes 2009-05-07 16:00:42.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 7 15:41:32 CEST 2009 - jsrain(a)suse.cz + +- adapted to changes in yast2-bootloader +- 2.18.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-live-installer-2.18.0.tar.bz2 New: ---- yast2-live-installer-2.18.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-live-installer.spec ++++++ --- /var/tmp/diff_new_pack.MS5207/_old 2009-05-07 17:47:24.000000000 +0200 +++ /var/tmp/diff_new_pack.MS5207/_new 2009-05-07 17:47:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-live-installer (Version 2.18.0) +# spec file for package yast2-live-installer (Version 2.18.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,17 @@ Name: yast2-live-installer -Version: 2.18.0 +Version: 2.18.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-live-installer-2.18.0.tar.bz2 +Source0: yast2-live-installer-2.18.1.tar.bz2 Prefix: /usr # Internet and InternetDevices Requires: yast2 >= 2.16.6 Requires: yast2-network >= 2.16.6 +Requires: yast2-bootloader >= 2.18.7 Requires: yast2-bootloader yast2-country yast2-installation yast2-storage BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite BuildArch: noarch @@ -45,7 +46,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-live-installer-2.18.0 +%setup -n yast2-live-installer-2.18.1 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +76,9 @@ %{prefix}/share/applications/YaST2/live-installer.desktop %doc %{prefix}/share/doc/packages/yast2-live-installer %changelog +* Thu May 07 2009 jsrain(a)suse.cz +- adapted to changes in yast2-bootloader +- 2.18.1 * Fri Jan 09 2009 jsrain(a)suse.de - optionally eject CD and reboot after the end of live installation (bnc #455760) ++++++ yast2-live-installer-2.18.0.tar.bz2 -> yast2-live-installer-2.18.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.0/configure new/yast2-live-installer-2.18.1/configure --- old/yast2-live-installer-2.18.0/configure 2009-01-12 18:01:08.000000000 +0100 +++ new/yast2-live-installer-2.18.1/configure 2009-05-07 15:59:16.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-live-installer 2.18.0. +# Generated by GNU Autoconf 2.63 for yast2-live-installer 2.18.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-live-installer' PACKAGE_TARNAME='yast2-live-installer' -PACKAGE_VERSION='2.18.0' -PACKAGE_STRING='yast2-live-installer 2.18.0' +PACKAGE_VERSION='2.18.1' +PACKAGE_STRING='yast2-live-installer 2.18.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1276,7 +1276,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-live-installer 2.18.0 to adapt to many kinds of systems. +\`configure' configures yast2-live-installer 2.18.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1348,7 +1348,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-live-installer 2.18.0:";; + short | recursive ) echo "Configuration of yast2-live-installer 2.18.1:";; esac cat <<\_ACEOF @@ -1428,7 +1428,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-live-installer configure 2.18.0 +yast2-live-installer configure 2.18.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1442,7 +1442,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-live-installer $as_me 2.18.0, which was +It was created by yast2-live-installer $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2289,7 +2289,7 @@ # Define the identity of the package. PACKAGE='yast2-live-installer' - VERSION='2.18.0' + VERSION='2.18.1' cat >>confdefs.h <<_ACEOF @@ -2513,7 +2513,7 @@ -VERSION="2.18.0" +VERSION="2.18.1" RPMNAME="yast2-live-installer" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3547,7 +3547,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-live-installer $as_me 2.18.0, which was +This file was extended by yast2-live-installer $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3597,7 +3597,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-live-installer config.status 2.18.0 +yast2-live-installer config.status 2.18.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.0/configure.in new/yast2-live-installer-2.18.1/configure.in --- old/yast2-live-installer-2.18.0/configure.in 2009-01-12 18:01:05.000000000 +0100 +++ new/yast2-live-installer-2.18.1/configure.in 2009-05-07 15:59:10.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-live-installer dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-live-installer, 2.18.0, http://bugs.opensuse.org/, yast2-live-installer) +AC_INIT(yast2-live-installer, 2.18.1, http://bugs.opensuse.org/, yast2-live-installer) 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.18.0" +VERSION="2.18.1" RPMNAME="yast2-live-installer" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.0/live-installer.pot new/yast2-live-installer-2.18.1/live-installer.pot --- old/yast2-live-installer-2.18.0/live-installer.pot 2008-12-12 14:03:45.000000000 +0100 +++ new/yast2-live-installer-2.18.1/live-installer.pot 2009-03-06 08:44:05.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-12 14:03+0100\n" +"POT-Creation-Date: 2009-03-06 08:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -20,37 +20,37 @@ msgid "Software Installation" msgstr "" -#: src/inst_live_doit.ycp:74 +#: src/inst_live_doit.ycp:75 #, ycp-format msgid "Copying %1..." msgstr "" #. Headline for last dialog of base installation: Install LILO etc. -#: src/inst_live_doit.ycp:109 +#: src/inst_live_doit.ycp:110 msgid "Copying the Live Image to Hard Disk" msgstr "" -#: src/inst_live_doit.ycp:112 +#: src/inst_live_doit.ycp:113 msgid "Evaluate filesystems to copy" msgstr "" -#: src/inst_live_doit.ycp:112 +#: src/inst_live_doit.ycp:113 msgid "Copy root filesystem" msgstr "" -#: src/inst_live_doit.ycp:112 +#: src/inst_live_doit.ycp:113 msgid "Copy additional filesystems" msgstr "" -#: src/inst_live_doit.ycp:120 +#: src/inst_live_doit.ycp:121 msgid "Evaluating filesystems to copy..." msgstr "" -#: src/inst_live_doit.ycp:123 +#: src/inst_live_doit.ycp:124 msgid "Copying root filesystem..." msgstr "" -#: src/inst_live_doit.ycp:132 +#: src/inst_live_doit.ycp:133 msgid "Finished." msgstr "" @@ -168,7 +168,7 @@ msgstr "" #. continue/cancel pop-up -#: src/live-installer.ycp:63 +#: src/live-installer.ycp:79 msgid "" "YaST detected a mounted removable media. YaST cannot install\n" "the system on media which is mounted.\n" @@ -176,13 +176,42 @@ msgstr "" #. continue-cancel popup -#: src/live-installer.ycp:91 +#: src/live-installer.ycp:107 msgid "" "openSUSE installer detected DMRAID array.\n" "It is not supported by the openSUSE live installer.\n" "Continuing the installation may cause data loss." msgstr "" +#. popup dialog, text followed by 'Reboot Now' and 'Reboot Later' buttons +#: src/live-installer.ycp:153 +msgid "" +"The computer needs to be rebooted without the Live CD in the\n" +"drive to finish the installation. Either YaST can reboot\n" +"now or you can reboot any time later.\n" +"\n" +"Note that if the Live CD is not ejected, you can either eject\n" +"it after the Live system shuts down or select \"Hard Disk\"\n" +"in the boot menu of the Live CD." +msgstr "" + +#. push button +#: src/live-installer.ycp:161 +msgid "Reboot &Now" +msgstr "" + +#: src/live-installer.ycp:161 +msgid "Reboot &Later" +msgstr "" + +#. error report +#: src/live-installer.ycp:176 +msgid "" +"Failed to restart the computer.\n" +"Reboot it manually. You may even need to push the\n" +"'Reset' button to restart it." +msgstr "" + #. progress step title #: src/live_copy_files_finish.ycp:51 msgid "Copying files to installed system..." @@ -193,17 +222,6 @@ msgid "Writing YaST Configuration..." msgstr "" -#. FIXME doesn't belong here -#: src/live_runme_at_boot_finish.ycp:66 -msgid "" -"Reboot the computer without the Live CD in the drive\n" -"to continue the installation.\n" -"\n" -"Note that the CD cannot be ejected now. You can eject\n" -"it after the Live system shuts down or by selecting\n" -"\"Hard Disk\" in the boot menu of the Live CD." -msgstr "" - #. progress step title #: src/live_save_config_finish.ycp:50 msgid "Saving language..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.0/Makefile.am new/yast2-live-installer-2.18.1/Makefile.am --- old/yast2-live-installer-2.18.0/Makefile.am 2009-01-12 18:01:05.000000000 +0100 +++ new/yast2-live-installer-2.18.1/Makefile.am 2009-05-07 15:59:11.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 old/yast2-live-installer-2.18.0/Makefile.in new/yast2-live-installer-2.18.1/Makefile.in --- old/yast2-live-installer-2.18.0/Makefile.in 2009-01-12 18:01:10.000000000 +0100 +++ new/yast2-live-installer-2.18.1/Makefile.in 2009-05-07 15:59:17.000000000 +0200 @@ -228,10 +228,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 CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec POT_DST = $(shell find -type d -name testsuite -prune , \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.0/src/live_copy_files_finish.ycp new/yast2-live-installer-2.18.1/src/live_copy_files_finish.ycp --- old/yast2-live-installer-2.18.0/src/live_copy_files_finish.ycp 2008-04-01 11:58:55.000000000 +0200 +++ new/yast2-live-installer-2.18.1/src/live_copy_files_finish.ycp 2009-05-07 15:41:21.000000000 +0200 @@ -22,7 +22,7 @@ import "FileUtils"; import "String"; import "Initrd"; -import "BootCommon"; +import "BootStorage"; // FIXME don't know why it fails :-( // import "SystemFilesCopy"; @@ -83,7 +83,7 @@ } // FIXME belongs somewhere else - Initrd::SetAdditionalParameters (Initrd::AdditionalParameters () + " -d " + BootCommon::RootPartitionDevice); + Initrd::SetAdditionalParameters (Initrd::AdditionalParameters () + " -d " + BootStorage::RootPartitionDevice); } else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-live-installer-2.18.0/VERSION new/yast2-live-installer-2.18.1/VERSION --- old/yast2-live-installer-2.18.0/VERSION 2009-01-12 17:58:26.000000000 +0100 +++ new/yast2-live-installer-2.18.1/VERSION 2009-05-07 15:41:45.000000000 +0200 @@ -1 +1 @@ -2.18.0 +2.18.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0