September 2007 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-trans-sk
by root＠Hilbert.suse.de 20 Sep '07

20 Sep '07

Hello community, here is the log from the commit of package yast2-trans-sk checked in at Thu Sep 20 23:05:09 CEST 2007. -------- --- yast2-trans-sk/yast2-trans-sk.changes 2007-09-17 14:09:47.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-sk/yast2-trans-sk.changes 2007-09-20 17:23:19.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 20 17:23:19 2007 - ke(a)suse.de + +- Update to version 2.15.10. + +------------------------------------------------------------------------ Old: ---- yast2-trans-sk-2.15.9.tar.bz2 New: ---- yast2-trans-sk-2.15.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-sk.spec ++++++ --- /var/tmp/diff_new_pack.e28364/_old 2007-09-20 23:05:05.000000000 +0200 +++ /var/tmp/diff_new_pack.e28364/_new 2007-09-20 23:05:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-sk (Version 2.15.9) +# spec file for package yast2-trans-sk (Version 2.15.10) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-sk -Version: 2.15.9 +Version: 2.15.10 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-sk-2.15.9.tar.bz2 +Source0: yast2-trans-sk-2.15.10.tar.bz2 Prefix: /usr Provides: locale(yast2:sk) BuildRequires: pkgconfig yast2-devtools @@ -27,7 +27,7 @@ YaST2 - Slovak Translations %prep -%setup -n yast2-trans-sk-2.15.9 +%setup -n yast2-trans-sk-2.15.10 %build autoreconf --force --install @@ -58,8 +58,9 @@ %doc %{prefix}/share/doc/packages/yast2-trans-sk %dir /usr/share/YaST2/locale %lang(sk) /usr/share/YaST2/locale/sk - %changelog +* Thu Sep 20 2007 - ke(a)suse.de +- Update to version 2.15.10. * Mon Sep 17 2007 - ke(a)suse.de - Update to version 2.15.9. * Thu Sep 13 2007 - ke(a)suse.de ++++++ yast2-trans-sk-2.15.9.tar.bz2 -> yast2-trans-sk-2.15.10.tar.bz2 ++++++ ++++ 2918 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 yast2-trans-ru
by root＠Hilbert.suse.de 20 Sep '07

20 Sep '07

Hello community, here is the log from the commit of package yast2-trans-ru checked in at Thu Sep 20 23:04:57 CEST 2007. -------- --- yast2-trans-ru/yast2-trans-ru.changes 2007-09-12 16:28:02.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-ru/yast2-trans-ru.changes 2007-09-20 17:30:42.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 20 17:30:42 2007 - ke(a)suse.de + +- Update to version 2.15.23. + +------------------------------------------------------------------------ Old: ---- yast2-trans-ru-2.15.22.tar.bz2 New: ---- yast2-trans-ru-2.15.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-ru.spec ++++++ --- /var/tmp/diff_new_pack.u27533/_old 2007-09-20 23:04:54.000000000 +0200 +++ /var/tmp/diff_new_pack.u27533/_new 2007-09-20 23:04:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-ru (Version 2.15.22) +# spec file for package yast2-trans-ru (Version 2.15.23) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,23 +11,23 @@ # norootforbuild Name: yast2-trans-ru -Version: 2.15.22 +Version: 2.15.23 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-ru-2.15.22.tar.bz2 -prefix: /usr +Source0: yast2-trans-ru-2.15.23.tar.bz2 +Prefix: /usr Provides: locale(yast2:ru) BuildRequires: pkgconfig yast2-devtools -BuildArchitectures: noarch +BuildArch: noarch Summary: YaST2 - Russian Translations %description YaST2 - Russian Translations %prep -%setup -n yast2-trans-ru-2.15.22 +%setup -n yast2-trans-ru-2.15.23 %build autoreconf --force --install @@ -58,8 +58,9 @@ %doc %{prefix}/share/doc/packages/yast2-trans-ru %dir /usr/share/YaST2/locale %lang(ru) /usr/share/YaST2/locale/ru - %changelog +* Thu Sep 20 2007 - ke(a)suse.de +- Update to version 2.15.23. * Wed Sep 12 2007 - ke(a)suse.de - Update to version 2.15.22. * Mon Sep 10 2007 - ke(a)suse.de ++++++ yast2-trans-ru-2.15.22.tar.bz2 -> yast2-trans-ru-2.15.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.22/configure new/yast2-trans-ru-2.15.23/configure --- old/yast2-trans-ru-2.15.22/configure 2007-09-12 16:28:13.000000000 +0200 +++ new/yast2-trans-ru-2.15.23/configure 2007-09-20 17:30:52.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-trans-ru 2.15.22. +# Generated by GNU Autoconf 2.60 for yast2-trans-ru 2.15.23. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-ru' PACKAGE_TARNAME='yast2-trans-ru' -PACKAGE_VERSION='2.15.22' -PACKAGE_STRING='yast2-trans-ru 2.15.22' +PACKAGE_VERSION='2.15.23' +PACKAGE_STRING='yast2-trans-ru 2.15.23' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1186,7 +1186,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-trans-ru 2.15.22 to adapt to many kinds of systems. +\`configure' configures yast2-trans-ru 2.15.23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1257,7 +1257,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-ru 2.15.22:";; + short | recursive ) echo "Configuration of yast2-trans-ru 2.15.23:";; esac cat <<\_ACEOF @@ -1337,7 +1337,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-trans-ru configure 2.15.22 +yast2-trans-ru configure 2.15.23 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1351,7 +1351,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-trans-ru $as_me 2.15.22, which was +It was created by yast2-trans-ru $as_me 2.15.23, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2152,7 +2152,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-ru' - VERSION='2.15.22' + VERSION='2.15.23' cat >>confdefs.h <<_ACEOF @@ -2379,7 +2379,7 @@ -VERSION="2.15.22" +VERSION="2.15.23" RPMNAME="yast2-trans-ru" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -3316,7 +3316,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-trans-ru $as_me 2.15.22, which was +This file was extended by yast2-trans-ru $as_me 2.15.23, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3359,7 +3359,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-trans-ru config.status 2.15.22 +yast2-trans-ru config.status 2.15.23 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.22/configure.in new/yast2-trans-ru-2.15.23/configure.in --- old/yast2-trans-ru-2.15.22/configure.in 2007-09-12 16:28:09.000000000 +0200 +++ new/yast2-trans-ru-2.15.23/configure.in 2007-09-20 17:30:48.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-trans-ru, 2.15.22, http://bugs.opensuse.org/, yast2-trans-ru) +AC_INIT(yast2-trans-ru, 2.15.23, http://bugs.opensuse.org/, yast2-trans-ru) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.22" +VERSION="2.15.23" RPMNAME="yast2-trans-ru" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.22/po/sound.ru.po new/yast2-trans-ru-2.15.23/po/sound.ru.po --- old/yast2-trans-ru-2.15.22/po/sound.ru.po 2007-08-10 17:09:58.000000000 +0200 +++ new/yast2-trans-ru-2.15.23/po/sound.ru.po 2007-09-20 16:54:19.000000000 +0200 @@ -1,4 +1,4 @@ -# translation of sound.po to Русский +# translation of sound.po to # Russian message file for YaST2 (@memory@). # Copyright (C) 2005, 2006 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. @@ -8,19 +8,20 @@ # Aleksey Novodvorksy <aen(a)logic.ru>, 2000. # Eugene Osintsev <osgene(a)omskelecom.ru>, 1999, 2000. # Vitaliy V. Sayfullin <vsayfullin(a)novell.ru>, 2006. +# Nikolay Derkach <nderkach(a)gmail.com>, 2007. msgid "" msgstr "" "Project-Id-Version: sound\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-10 13:37+0200\n" -"PO-Revision-Date: 2007-07-05 11:38+0400\n" -"Last-Translator: Aleksey Osipov <aliks-os(a)yandex.ru>\n" -"Language-Team: Novell Language <language(a)novell.com>\n" +"PO-Revision-Date: 2007-09-18 03:45+0400\n" +"Last-Translator: Nikolay Derkach <nderkach(a)gmail.com>\n" +"Language-Team: <opensuse-ru(a)opensuse.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" #. database entry #: sound/src/Joystick.ycp:40 @@ -70,7 +71,7 @@ #. button label #: sound/src/Sound.ycp:350 msgid "&Yes, Probe" -msgstr "Да, опробировать" +msgstr "&Да, проверить" #. popup dialog header #: sound/src/Sound.ycp:369 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ru-2.15.22/VERSION new/yast2-trans-ru-2.15.23/VERSION --- old/yast2-trans-ru-2.15.22/VERSION 2007-09-12 16:28:02.000000000 +0200 +++ new/yast2-trans-ru-2.15.23/VERSION 2007-09-20 17:30:42.000000000 +0200 @@ -1 +1 @@ -2.15.22 +2.15.23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-storage
by root＠Hilbert.suse.de 20 Sep '07

20 Sep '07

Hello community, here is the log from the commit of package yast2-storage checked in at Thu Sep 20 23:04:48 CEST 2007. -------- --- yast2-storage/yast2-storage.changes 2007-09-17 14:26:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-09-20 15:52:28.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Sep 20 15:50:27 CEST 2007 - fehr(a)suse.de + +- make importing fstab cope with changing disk names (#309774) +- version 2.15.26 + +------------------------------------------------------------------- +Tue Sep 18 18:22:57 CEST 2007 - fehr(a)suse.de + +- fix wrong cryptotab line for old style encryption (#325597) + +------------------------------------------------------------------- @@ -4 +15 @@ -- version 2.15.24 +- version 2.15.25 Old: ---- yast2-storage-2.15.25.tar.bz2 New: ---- yast2-storage-2.15.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.R25396/_old 2007-09-20 23:04:31.000000000 +0200 +++ /var/tmp/diff_new_pack.R25396/_new 2007-09-20 23:04:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.15.25) +# spec file for package yast2-storage (Version 2.15.26) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-storage -Version: 2.15.25 +Version: 2.15.26 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.15.25.tar.bz2 +Source0: yast2-storage-2.15.26.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms evms-devel gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite # Required only in inst-sys @@ -44,7 +44,7 @@ %prep -%setup -n yast2-storage-2.15.25 +%setup -n yast2-storage-2.15.26 %build %{prefix}/bin/y2tool y2autoconf @@ -172,10 +172,14 @@ %doc %{prefix}/share/doc/packages/yast2-storage/examples %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description - %changelog +* Thu Sep 20 2007 - fehr(a)suse.de +- make importing fstab cope with changing disk names (#309774) +- version 2.15.26 +* Tue Sep 18 2007 - fehr(a)suse.de +- fix wrong cryptotab line for old style encryption (#325597) * Mon Sep 17 2007 - fehr(a)suse.de -- version 2.15.24 +- version 2.15.25 * Thu Sep 13 2007 - fehr(a)suse.de - change activation of md devices (#309841) * Tue Sep 11 2007 - fehr(a)suse.de ++++++ yast2-storage-2.15.25.tar.bz2 -> yast2-storage-2.15.26.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/libstorage/src/LoopCo.h new/yast2-storage-2.15.26/libstorage/src/LoopCo.h --- old/yast2-storage-2.15.25/libstorage/src/LoopCo.h 2007-07-18 12:39:00.000000000 +0200 +++ new/yast2-storage-2.15.26/libstorage/src/LoopCo.h 2007-09-18 13:49:59.000000000 +0200 @@ -90,7 +90,6 @@ bool findLoopDev( const string& dev, LoopIter& i ); void addLoop( Loop* m ); void updateEntry( const Loop* m ); - static int getFreeLoop( string& dev ); void init(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/libstorage/src/Storage.cc new/yast2-storage-2.15.26/libstorage/src/Storage.cc --- old/yast2-storage-2.15.25/libstorage/src/Storage.cc 2007-09-13 12:17:22.000000000 +0200 +++ new/yast2-storage-2.15.26/libstorage/src/Storage.cc 2007-09-20 14:56:00.000000000 +0200 @@ -5748,6 +5748,7 @@ Storage::readFstab( const string& dir, deque<VolumeInfo>& infos ) { static deque<VolumeInfo> vil; + static Regex disk_part( "^/dev/[sh]d[a-z]+[0-9]+$" ); vil.clear(); bool ret = false; VolIterator vol; @@ -5759,13 +5760,31 @@ for( list<FstabEntry>::const_iterator i=le.begin(); i!=le.end(); ++i ) { y2mil( "entry:" << *i ); - if( findVolume( i->dentry, vol ) ) + VolumeInfo* info = NULL; + if( disk_part.match( i->dentry ) ) { - VolumeInfo info; - vol->getInfo( info ); - vol->mergeFstabInfo( info, *i ); + info = new VolumeInfo; + info->create = info->format = info->resize = false; + info->sizeK = info->OrigSizeK = info->minor = info->major = 0; + info->device = i->dentry; + info->mount = i->mount; + info->mount_by = MOUNTBY_DEVICE; + info->fs = Volume::toFsType( i->fs ); + info->fstab_options = mergeString( i->opts, "," ); + vil.push_back( *info ); + } + else if( findVolume( i->dentry, vol ) ) + { + info = new VolumeInfo; + vol->getInfo( *info ); + vol->mergeFstabInfo( *info, *i ); y2mil( "volume:" << *vol ); - vil.push_back( info ); + vil.push_back( *info ); + } + if( info ) + { + delete info; + info = NULL; } } delete fstab; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/libstorage/src/Volume.cc new/yast2-storage-2.15.26/libstorage/src/Volume.cc --- old/yast2-storage-2.15.25/libstorage/src/Volume.cc 2007-09-05 12:06:17.000000000 +0200 +++ new/yast2-storage-2.15.26/libstorage/src/Volume.cc 2007-09-18 18:19:15.000000000 +0200 @@ -2268,7 +2268,7 @@ if( cont->type()!=LOOP ) { if( dmcrypt() ) - ret = optNoauto()?dev:dmcrypt_dev; + ret = (inCryptotab()||optNoauto())?dev:dmcrypt_dev; else ret = getMountByString( mount_by, dev, uuid, label ); } @@ -2414,8 +2414,11 @@ { changed = true; che.encr = encryption; - if( !dmcrypt() ) + if( inCryptotab() ) + { + getFreeLoop(); che.loop_dev = fstab_loop_dev; + } che.dentry = de; if( encryption!=ENC_NONE ) che.freq = che.passno = 0; @@ -2448,8 +2451,11 @@ che.encr = encryption; if( dmcrypt() && isTmpCryptMp(mp) && crypt_pwd.empty() ) che.tmpcrypt = true; - if( !dmcrypt() ) + if( inCryptotab() ) + { + getFreeLoop(); che.loop_dev = fstab_loop_dev; + } che.fs = fs_names[fs]; getFstabOpts( che.opts ); che.mount = mp; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/libstorage/src/Volume.h new/yast2-storage-2.15.26/libstorage/src/Volume.h --- old/yast2-storage-2.15.25/libstorage/src/Volume.h 2007-08-28 17:07:46.000000000 +0200 +++ new/yast2-storage-2.15.26/libstorage/src/Volume.h 2007-09-18 14:42:13.000000000 +0200 @@ -157,7 +157,7 @@ string sizeString() const; string bootMount() const; bool optNoauto() const; - bool inCryptotab() const { return( encryption!=ENC_LUKS && is_loop && !optNoauto() ); } + bool inCryptotab() const { return( encryption!=ENC_LUKS && !optNoauto() ); } bool inCrypttab() const { return( encryption==ENC_LUKS && !optNoauto() ); } virtual void print( std::ostream& s ) const { s << *this; } int getFreeLoop(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.15.26/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.15.25/storage/src/include/custom_part_lib.ycp 2007-08-27 15:41:53.000000000 +0200 +++ new/yast2-storage-2.15.26/storage/src/include/custom_part_lib.ycp 2007-09-20 15:52:49.000000000 +0200 @@ -13,7 +13,7 @@ * ************************************************************* * - $Id: custom_part_lib.ycp 40502 2007-08-27 13:41:53Z fehr $ + $Id: custom_part_lib.ycp 40987 2007-09-20 13:52:49Z fehr $ * */ @@ -28,6 +28,61 @@ #include "partitioning/partition_defines.ycp"; +define string mountVar( map var, map root, string rdev, string mp, + map<string,map> targetMap ) + ``{ + string ret = ""; + boolean mount_success = false; + y2milestone( "mountVar rdev:%1 mp:%2 var:%3 root:%4", rdev, mp, var, root ); + if( var["size_k"]:0>0 ) + { + ret = var["device"]:""; + } + else + { + list<string> ds = maplist( string d, map disk, targetMap, ``(d)); + y2milestone( "mountVar ds:%1", ds ); + ds = filter( string d, ds, ``(targetMap[d,"type"]:`CT_UNKNOWN==`CT_DISK)); + y2milestone( "mountVar ds:%1", ds ); + map rootm = Storage::GetDiskPartition( rdev ); + map rootf = Storage::GetDiskPartition( root["device"]:"" ); + map varf = Storage::GetDiskPartition( var["device"]:"" ); + if( rootf["disk"]:""==varf["disk"]:"" ) + { + ret = Storage::GetDeviceName( rootm["disk"]:"", varf["nr"]:(any)0 ); + } + else if( size(ds)==1 ) + { + ret = Storage::GetDeviceName( ds[0]:"", varf["nr"]:(any)0 ); + } + else if( size(ds)>1 ) + { + integer i = 0; + while( i<size(ds) && size(ret)==0 ) + { + ret = Storage::GetDeviceName( ds[i]:"", varf["nr"]:(any)0 ); + if( size(Storage::GetPartition( targetMap, ret ))>0 && + Storage::Mount( ret, mp ) ) + { + map d = (map)SCR::Read( .target.stat, mp+"/lib/hardware" ); + y2milestone( "mountVar d:%1", d ); + if( !d["isdir"]:false ) + ret = ""; + Storage::Umount( ret ); + } + else + ret = ""; + i = i+1; + } + } + } + if( size(ret)>0 && !Storage::Mount( ret, mp )) + ret = ""; + y2milestone( "mountVar ret:%1", ret ); + return( ret ); + } + + /** * Find and read fstab by installation. Scan existing partitions. * @parm targetMap all targets @@ -38,14 +93,15 @@ ``{ ///////////////////////////////////////////////////////////////// // foreach partition on each target - list<list> fstab = []; - list skip_fs = [ `unknown, `swap, `vfat, `ntfs ]; + list<list> fstab = []; + list skip_fs = [ `unknown, `swap, `vfat, `ntfs ]; foreach( string dev, map disk, targetMap, ``{ foreach( map part, filter( map p, disk["partitions"]:[], - ``(!contains( skip_fs, p["detected_fs"]:`unknown) )), + ``(!contains( skip_fs, + p["detected_fs"]:`unknown) )), ``{ ///////////////////////////////////////////////////// // try to mount @@ -55,10 +111,40 @@ if( mount_success && SCR::Read(.target.size, search_point+"/etc/fstab") > 0 ) { - list tmp = Storage::ReadFstab( search_point+"/etc" ); + list<map> tmp = + (list<map>)Storage::ReadFstab( search_point+"/etc" ); y2milestone( "findExistingFstab fstab %1", tmp ); if( size(tmp)>0 ) { + if( find( map p, tmp, ``(p["size_k"]:0==0 ))!=nil ) + { + string vardev = ""; + map var = find( map p, tmp, ``(p["mount"]:""=="/var")); + map root = find( map p, tmp, ``(p["mount"]:""=="/")); + y2milestone( "findExistingFstab var %1", var ); + if( var != nil ) + { + vardev = mountVar( var, root, part["device"]:"", + search_point+"/var", targetMap ); + y2milestone( "findExistingFstab vardev %1", + vardev ); + } + map dmap = Storage::BuildDiskmap( $[] ); + if( size(dmap)>0 ) + { + y2milestone( "findExistingFstab dmap %1", dmap ); + y2milestone( "findExistingFstab tmp %1", tmp ); + tmp = maplist( map p, tmp, + ``{ + if( p["size_k"]:0 == 0 ) + p["device"] = Storage::HdDiskMap( p["device"]:"", dmap ); + return( p ); + }); + y2milestone( "findExistingFstab tmp %1", tmp ); + } + if( size(vardev)>0 ) + Storage::Umount( vardev ); + } fstab = add( fstab, tmp ); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/storage/src/modules/Storage.ycp new/yast2-storage-2.15.26/storage/src/modules/Storage.ycp --- old/yast2-storage-2.15.25/storage/src/modules/Storage.ycp 2007-09-10 19:15:39.000000000 +0200 +++ new/yast2-storage-2.15.26/storage/src/modules/Storage.ycp 2007-09-20 15:52:49.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 40839 2007-09-10 17:15:39Z fehr $ + * $Id: Storage.ycp 40987 2007-09-20 13:52:49Z fehr $ */ { @@ -5243,10 +5243,12 @@ } -define map BuildDiskmap( map oldv ) +global define map BuildDiskmap( map oldv ) ``{ map d = (map)SCR::Read( .target.stat, Installation::destdir + "/var/lib/hardware" ); + if( !d["isdir"]:false ) + DiskMap = $[]; if( d["isdir"]:false && (oldv != DiskMapVersion || size(oldv)==0) ) { DiskMap = $[]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/VERSION new/yast2-storage-2.15.26/VERSION --- old/yast2-storage-2.15.25/VERSION 2007-09-17 14:26:13.000000000 +0200 +++ new/yast2-storage-2.15.26/VERSION 2007-09-20 15:51:57.000000000 +0200 @@ -1 +1 @@ -2.15.25 +2.15.26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-trans-ro
by root＠Hilbert.suse.de 20 Sep '07

20 Sep '07

Hello community, here is the log from the commit of package yast2-trans-ro checked in at Thu Sep 20 23:04:47 CEST 2007. -------- --- yast2-trans-ro/yast2-trans-ro.changes 2007-09-17 13:54:29.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-ro/yast2-trans-ro.changes 2007-09-20 17:36:34.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 20 17:36:34 2007 - ke(a)suse.de + +- Update to version 2.15.19. + +------------------------------------------------------------------------ Old: ---- yast2-trans-ro-2.15.18.tar.bz2 New: ---- yast2-trans-ro-2.15.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-ro.spec ++++++ --- /var/tmp/diff_new_pack.J26361/_old 2007-09-20 23:04:43.000000000 +0200 +++ /var/tmp/diff_new_pack.J26361/_new 2007-09-20 23:04:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-ro (Version 2.15.18) +# spec file for package yast2-trans-ro (Version 2.15.19) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-ro -Version: 2.15.18 +Version: 2.15.19 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-ro-2.15.18.tar.bz2 +Source0: yast2-trans-ro-2.15.19.tar.bz2 Prefix: /usr Provides: locale(yast2:ro) BuildRequires: pkgconfig yast2-devtools @@ -30,7 +30,7 @@ %prep -%setup -n yast2-trans-ro-2.15.18 +%setup -n yast2-trans-ro-2.15.19 %build autoreconf --force --install @@ -61,8 +61,9 @@ %doc %{prefix}/share/doc/packages/yast2-trans-ro %dir /usr/share/YaST2/locale %lang(ro) /usr/share/YaST2/locale/ro - %changelog +* Thu Sep 20 2007 - ke(a)suse.de +- Update to version 2.15.19. * Mon Sep 17 2007 - ke(a)suse.de - Update to version 2.15.18. * Wed Sep 12 2007 - ke(a)suse.de ++++++ yast2-trans-ro-2.15.18.tar.bz2 -> yast2-trans-ro-2.15.19.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ro-2.15.18/configure new/yast2-trans-ro-2.15.19/configure --- old/yast2-trans-ro-2.15.18/configure 2007-09-17 13:54:40.000000000 +0200 +++ new/yast2-trans-ro-2.15.19/configure 2007-09-20 17:36:44.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-trans-ro 2.15.18. +# Generated by GNU Autoconf 2.60 for yast2-trans-ro 2.15.19. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-ro' PACKAGE_TARNAME='yast2-trans-ro' -PACKAGE_VERSION='2.15.18' -PACKAGE_STRING='yast2-trans-ro 2.15.18' +PACKAGE_VERSION='2.15.19' +PACKAGE_STRING='yast2-trans-ro 2.15.19' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1186,7 +1186,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-trans-ro 2.15.18 to adapt to many kinds of systems. +\`configure' configures yast2-trans-ro 2.15.19 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1257,7 +1257,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-ro 2.15.18:";; + short | recursive ) echo "Configuration of yast2-trans-ro 2.15.19:";; esac cat <<\_ACEOF @@ -1337,7 +1337,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-trans-ro configure 2.15.18 +yast2-trans-ro configure 2.15.19 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1351,7 +1351,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-trans-ro $as_me 2.15.18, which was +It was created by yast2-trans-ro $as_me 2.15.19, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2152,7 +2152,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-ro' - VERSION='2.15.18' + VERSION='2.15.19' cat >>confdefs.h <<_ACEOF @@ -2379,7 +2379,7 @@ -VERSION="2.15.18" +VERSION="2.15.19" RPMNAME="yast2-trans-ro" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -3316,7 +3316,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-trans-ro $as_me 2.15.18, which was +This file was extended by yast2-trans-ro $as_me 2.15.19, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3359,7 +3359,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-trans-ro config.status 2.15.18 +yast2-trans-ro config.status 2.15.19 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ro-2.15.18/configure.in new/yast2-trans-ro-2.15.19/configure.in --- old/yast2-trans-ro-2.15.18/configure.in 2007-09-17 13:54:35.000000000 +0200 +++ new/yast2-trans-ro-2.15.19/configure.in 2007-09-20 17:36:40.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-trans-ro, 2.15.18, http://bugs.opensuse.org/, yast2-trans-ro) +AC_INIT(yast2-trans-ro, 2.15.19, http://bugs.opensuse.org/, yast2-trans-ro) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.18" +VERSION="2.15.19" RPMNAME="yast2-trans-ro" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ro-2.15.18/po/nis_server.ro.po new/yast2-trans-ro-2.15.19/po/nis_server.ro.po --- old/yast2-trans-ro-2.15.18/po/nis_server.ro.po 2007-08-17 16:54:14.000000000 +0200 +++ new/yast2-trans-ro-2.15.19/po/nis_server.ro.po 2007-09-20 17:01:19.000000000 +0200 @@ -1,26 +1,26 @@ -# translation of nis_server.po to Romanian +# translation of nis_server.ro.po to # Romanian message file for YaST2 (@memory@). # Copyright (C) 2003 SuSE Linux AG. # # Stanciu-Lixandru Alec <stanciulixandru(a)gmail.com>, 2007. msgid "" msgstr "" -"Project-Id-Version: nis_server\n" +"Project-Id-Version: nis_server.ro\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-10 13:33+0200\n" -"PO-Revision-Date: 2007-08-17 15:46+0300\n" -"Last-Translator: Stanciu-Lixandru Alec <stanciulixandru(a)gmail.com>\n" -"Language-Team: Romanian <ro(a)li.org>\n" +"PO-Revision-Date: 2007-09-17 22:50+0200\n" +"Last-Translator: \n" +"Language-Team: <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: KBabel 1.11.2\n" #. help text 1/1 #: src/NisServer.ycp:205 msgid "Please wait while reading the configuration." -msgstr "Vă rog aşteptaţi cât citesc configraţia." +msgstr "Vă rog aşteptaţi cât citesc configuraţia." #. dialog heading #: src/NisServer.ycp:207 @@ -31,45 +31,43 @@ #: src/NisServer.ycp:228 #, ycp-format msgid "Load '%1' file" -msgstr "Încarc fişierul '%1'" +msgstr "Încarcă fişierul '%1'" #. Trans: progress label #: src/NisServer.ycp:231 msgid "Determine running services" -msgstr "Descopăr serviciile care rulează" +msgstr "Determină serviciile care rulează" #. Trans: progress label #: src/NisServer.ycp:233 msgid "Determine server type" -msgstr "" +msgstr "Determină tipul serverului" #. progress stage label #: src/NisServer.ycp:235 msgid "Read firewall settings" -msgstr "Citiţi configuraţia firewall-ului" +msgstr "Citeşte configuraţia firewall-ului" #. To translators: progress label %1 is filename #: src/NisServer.ycp:238 #, ycp-format msgid "Loading '%1'..." -msgstr "" +msgstr "Încarc '%1'..." #. Trans: progress label #: src/NisServer.ycp:241 -#, fuzzy msgid "Determining running services..." -msgstr "Repornesc serviciile..." +msgstr "Determin serviciile care rulează..." #. Trans: progress label #: src/NisServer.ycp:243 -#, fuzzy msgid "Determining server type..." -msgstr "Detectez tipul sistemului de fişiere..." +msgstr "Determin tipul serverului..." #. progress step label #: src/NisServer.ycp:245 msgid "Reading firewall settings..." -msgstr "Citesc configuraţia firewall-ului" +msgstr "Citesc configuraţia firewall-ului..." #. Trans: progress label #. progress step @@ -79,35 +77,29 @@ #. help text 1/1 #: src/NisServer.ycp:499 -#, fuzzy msgid "Please wait until the configuration is saved." -msgstr "" -"\n" -"Vă rog să aşteptaţi ca sistemul să fie configurat.\n" -"" +msgstr "Vă rog aşteptaţi până este salvată configuraţia." #. dialog heading #: src/NisServer.ycp:501 msgid "Saving NIS server setup" -msgstr "" +msgstr "Salvez configuraţia serverului NIS" #. progress bar stage #: src/NisServer.ycp:512 -#, fuzzy msgid "Save firewall settings" -msgstr "Citiţi configuraţia firewall-ului" +msgstr "Salvează setările firewall-ului" #. progress step #: src/NisServer.ycp:517 -#, fuzzy msgid "Saving firewall settings..." -msgstr "Citesc configuraţia firewall-ului" +msgstr "Salvez setările firewall-ului..." #. To translators: message in the popup dialog #: src/NisServer.ycp:565 #, ycp-format msgid "Error while removing %1\n" -msgstr "" +msgstr "Eroare la ştergerea %1\n" #. To translators: message in the popup dialog #: src/NisServer.ycp:586 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ro-2.15.18/po/status.txt new/yast2-trans-ro-2.15.19/po/status.txt --- old/yast2-trans-ro-2.15.18/po/status.txt 2007-09-17 11:44:53.000000000 +0200 +++ new/yast2-trans-ro-2.15.19/po/status.txt 2007-09-20 17:01:55.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 12181 -Fuzzy : 2836 -Untranslated : 2979 +Translated : 12190 +Fuzzy : 2831 +Untranslated : 2975 -------------------- All strings : 17996 68 % are translated diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-ro-2.15.18/VERSION new/yast2-trans-ro-2.15.19/VERSION --- old/yast2-trans-ro-2.15.18/VERSION 2007-09-17 13:54:29.000000000 +0200 +++ new/yast2-trans-ro-2.15.19/VERSION 2007-09-20 17:36:34.000000000 +0200 @@ -1 +1 @@ -2.15.18 +2.15.19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-trans-pt_BR
by root＠Hilbert.suse.de 20 Sep '07

20 Sep '07

Hello community, here is the log from the commit of package yast2-trans-pt_BR checked in at Thu Sep 20 23:04:36 CEST 2007. -------- --- yast2-trans-pt_BR/yast2-trans-pt_BR.changes 2007-09-17 13:59:47.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-pt_BR/yast2-trans-pt_BR.changes 2007-09-20 17:11:00.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 20 17:11:00 2007 - ke(a)suse.de + +- Update to version 2.15.12. + +------------------------------------------------------------------------ Old: ---- yast2-trans-pt_BR-2.15.11.tar.bz2 New: ---- yast2-trans-pt_BR-2.15.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-pt_BR.spec ++++++ --- /var/tmp/diff_new_pack.I25532/_old 2007-09-20 23:04:33.000000000 +0200 +++ /var/tmp/diff_new_pack.I25532/_new 2007-09-20 23:04:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-pt_BR (Version 2.15.11) +# spec file for package yast2-trans-pt_BR (Version 2.15.12) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-pt_BR -Version: 2.15.11 +Version: 2.15.12 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-pt_BR-2.15.11.tar.bz2 +Source0: yast2-trans-pt_BR-2.15.12.tar.bz2 Prefix: /usr Provides: locale(yast2:pt_BR) BuildRequires: pkgconfig yast2-devtools @@ -29,7 +29,7 @@ %prep -%setup -n yast2-trans-pt_BR-2.15.11 +%setup -n yast2-trans-pt_BR-2.15.12 %build autoreconf --force --install @@ -60,8 +60,9 @@ %doc %{prefix}/share/doc/packages/yast2-trans-pt_BR %dir /usr/share/YaST2/locale %lang(pt) /usr/share/YaST2/locale/pt_BR - %changelog +* Thu Sep 20 2007 - ke(a)suse.de +- Update to version 2.15.12. * Mon Sep 17 2007 - ke(a)suse.de - Update to version 2.15.11. * Wed Sep 12 2007 - ke(a)suse.de ++++++ yast2-trans-pt_BR-2.15.11.tar.bz2 -> yast2-trans-pt_BR-2.15.12.tar.bz2 ++++++ ++++ 2616 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 yast2-trans-nl
by root＠Hilbert.suse.de 20 Sep '07

20 Sep '07

Hello community, here is the log from the commit of package yast2-trans-nl checked in at Thu Sep 20 23:04:25 CEST 2007. -------- --- yast2-trans-nl/yast2-trans-nl.changes 2007-09-07 11:34:37.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-nl/yast2-trans-nl.changes 2007-09-20 17:17:59.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 20 17:17:59 2007 - ke(a)suse.de + +- Update to version 2.15.9. + +------------------------------------------------------------------------ Old: ---- yast2-trans-nl-2.15.8.tar.bz2 New: ---- yast2-trans-nl-2.15.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-nl.spec ++++++ --- /var/tmp/diff_new_pack.X24327/_old 2007-09-20 23:04:23.000000000 +0200 +++ /var/tmp/diff_new_pack.X24327/_new 2007-09-20 23:04:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-nl (Version 2.15.8) +# spec file for package yast2-trans-nl (Version 2.15.9) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,23 +11,23 @@ # norootforbuild Name: yast2-trans-nl -Version: 2.15.8 +Version: 2.15.9 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-nl-2.15.8.tar.bz2 -prefix: /usr +Source0: yast2-trans-nl-2.15.9.tar.bz2 +Prefix: /usr Provides: locale(yast2:nl) BuildRequires: pkgconfig yast2-devtools -BuildArchitectures: noarch +BuildArch: noarch Summary: YaST2 - Dutch Translations %description YaST2 - Dutch Translations %prep -%setup -n yast2-trans-nl-2.15.8 +%setup -n yast2-trans-nl-2.15.9 %build autoreconf --force --install @@ -58,8 +58,9 @@ %doc %{prefix}/share/doc/packages/yast2-trans-nl %dir /usr/share/YaST2/locale %lang(nl) /usr/share/YaST2/locale/nl - %changelog +* Thu Sep 20 2007 - ke(a)suse.de +- Update to version 2.15.9. * Fri Sep 07 2007 - ke(a)suse.de - Update to version 2.15.8. * Mon Aug 27 2007 - ke(a)suse.de ++++++ yast2-trans-nl-2.15.8.tar.bz2 -> yast2-trans-nl-2.15.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-nl-2.15.8/configure new/yast2-trans-nl-2.15.9/configure --- old/yast2-trans-nl-2.15.8/configure 2007-09-07 11:34:48.000000000 +0200 +++ new/yast2-trans-nl-2.15.9/configure 2007-09-20 17:18:09.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-trans-nl 2.15.8. +# Generated by GNU Autoconf 2.60 for yast2-trans-nl 2.15.9. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-nl' PACKAGE_TARNAME='yast2-trans-nl' -PACKAGE_VERSION='2.15.8' -PACKAGE_STRING='yast2-trans-nl 2.15.8' +PACKAGE_VERSION='2.15.9' +PACKAGE_STRING='yast2-trans-nl 2.15.9' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1186,7 +1186,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-trans-nl 2.15.8 to adapt to many kinds of systems. +\`configure' configures yast2-trans-nl 2.15.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1257,7 +1257,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-nl 2.15.8:";; + short | recursive ) echo "Configuration of yast2-trans-nl 2.15.9:";; esac cat <<\_ACEOF @@ -1337,7 +1337,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-trans-nl configure 2.15.8 +yast2-trans-nl configure 2.15.9 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1351,7 +1351,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-trans-nl $as_me 2.15.8, which was +It was created by yast2-trans-nl $as_me 2.15.9, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2152,7 +2152,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-nl' - VERSION='2.15.8' + VERSION='2.15.9' cat >>confdefs.h <<_ACEOF @@ -2379,7 +2379,7 @@ -VERSION="2.15.8" +VERSION="2.15.9" RPMNAME="yast2-trans-nl" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -3316,7 +3316,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-trans-nl $as_me 2.15.8, which was +This file was extended by yast2-trans-nl $as_me 2.15.9, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3359,7 +3359,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-trans-nl config.status 2.15.8 +yast2-trans-nl config.status 2.15.9 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-nl-2.15.8/configure.in new/yast2-trans-nl-2.15.9/configure.in --- old/yast2-trans-nl-2.15.8/configure.in 2007-09-07 11:34:44.000000000 +0200 +++ new/yast2-trans-nl-2.15.9/configure.in 2007-09-20 17:18:05.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-trans-nl, 2.15.8, http://bugs.opensuse.org/, yast2-trans-nl) +AC_INIT(yast2-trans-nl, 2.15.9, http://bugs.opensuse.org/, yast2-trans-nl) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.8" +VERSION="2.15.9" RPMNAME="yast2-trans-nl" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-nl-2.15.8/po/OneClickInstall.nl.po new/yast2-trans-nl-2.15.9/po/OneClickInstall.nl.po --- old/yast2-trans-nl-2.15.8/po/OneClickInstall.nl.po 2007-09-07 10:44:05.000000000 +0200 +++ new/yast2-trans-nl-2.15.9/po/OneClickInstall.nl.po 2007-09-20 16:40:43.000000000 +0200 @@ -1,4 +1,4 @@ -# translation of OneClickInstall.po to Nederlands +# translation of OneClickInstall.nl.po to Dutch # Dutch message file for YaST 2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. @@ -12,16 +12,16 @@ # Rinse de Vries <rinsedevries(a)kde.nl>, 2007. msgid "" msgstr "" -"Project-Id-Version: OneClickInstall\n" +"Project-Id-Version: OneClickInstall.nl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-09-03 14:25+0200\n" -"PO-Revision-Date: 2007-08-23 23:56+0200\n" +"PO-Revision-Date: 2007-09-18 01:52+0200\n" "Last-Translator: Rinse de Vries <rinsedevries(a)kde.nl>\n" -"Language-Team: Nederlands <kde-i18n-nl(a)kde.org>\n" +"Language-Team: Dutch <nl(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" #. * <region name="String constants"> * @@ -210,9 +210,8 @@ msgstr "Niets te doen" #: src/OneClickInstallUI.ycp:389 -#, fuzzy msgid "Installation Steps" -msgstr "Installatie is gestart" +msgstr "Installatiestappen" #: src/OneClickInstallUI.ycp:509 msgid "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-nl-2.15.8/po/status.txt new/yast2-trans-nl-2.15.9/po/status.txt --- old/yast2-trans-nl-2.15.8/po/status.txt 2007-09-07 10:46:28.000000000 +0200 +++ new/yast2-trans-nl-2.15.9/po/status.txt 2007-09-20 16:43:24.000000000 +0200 @@ -1,5 +1,5 @@ -Translated : 17995 -Fuzzy : 1 +Translated : 17996 +Fuzzy : 0 Untranslated : 0 -------------------- All strings : 17996 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-nl-2.15.8/VERSION new/yast2-trans-nl-2.15.9/VERSION --- old/yast2-trans-nl-2.15.8/VERSION 2007-09-07 11:34:37.000000000 +0200 +++ new/yast2-trans-nl-2.15.9/VERSION 2007-09-20 17:17:59.000000000 +0200 @@ -1 +1 @@ -2.15.8 +2.15.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-network
by root＠Hilbert.suse.de 20 Sep '07

20 Sep '07

Hello community, here is the log from the commit of package yast2-network checked in at Thu Sep 20 23:04:23 CEST 2007. -------- --- yast2-network/yast2-network.changes 2007-09-18 15:10:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-09-20 18:49:42.055003000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 20 18:40:22 CEST 2007 - kmachalkova(a)suse.cz + +- Always add '127.0.0.2 host.site host' line into /etc/hosts (if + 'Write hostname to /etc/hosts' is enabled) to make hostname + resolvable even without active network (#304632) +- 2.15.78 + +------------------------------------------------------------------- +Thu Sep 20 16:59:25 CEST 2007 - mvidner(a)suse.cz + +- Escape quotes in NAME in save_network (#305343). + +------------------------------------------------------------------- Old: ---- yast2-network-2.15.77.tar.bz2 New: ---- yast2-network-2.15.78.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.k22871/_old 2007-09-20 23:04:09.000000000 +0200 +++ /var/tmp/diff_new_pack.k22871/_new 2007-09-20 23:04:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.15.77) +# spec file for package yast2-network (Version 2.15.78) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-network -Version: 2.15.77 +Version: 2.15.78 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.77.tar.bz2 +Source0: yast2-network-2.15.78.tar.bz2 Prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -44,12 +44,12 @@ Summary: YaST2 - Network Configuration %package devel-doc -Version: 2.15.77 +Version: 2.15.78 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.77.tar.bz2 +Source0: yast2-network-2.15.78.tar.bz2 Prefix: /usr Requires: yast2-network >= 2.15.53 Summary: YaST2 - Developer documentation for yast2-network @@ -73,7 +73,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.15.77 +%setup -n yast2-network-2.15.78 %build %{prefix}/bin/y2tool y2autoconf @@ -138,8 +138,14 @@ %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/COPYRIGHT.english %exclude %{prefix}/share/doc/packages/yast2-network/README - %changelog +* Thu Sep 20 2007 - kmachalkova(a)suse.cz +- Always add '127.0.0.2 host.site host' line into /etc/hosts (if + 'Write hostname to /etc/hosts' is enabled) to make hostname + resolvable even without active network (#304632) +- 2.15.78 +* Thu Sep 20 2007 - mvidner(a)suse.cz +- Escape quotes in NAME in save_network (#305343). * Tue Sep 18 2007 - kmachalkova(a)suse.cz - Removed all udev rules workarounds (manually removing lockfiles, tmp rules, calling udevtrigger) - just copy udev rules for net and ++++++ yast2-network-2.15.77.tar.bz2 -> yast2-network-2.15.78.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.77/src/clients/save_network.ycp new/yast2-network-2.15.78/src/clients/save_network.ycp --- old/yast2-network-2.15.77/src/clients/save_network.ycp 2007-09-18 15:09:14.000000000 +0200 +++ new/yast2-network-2.15.78/src/clients/save_network.ycp 2007-09-20 18:46:51.000000000 +0200 @@ -38,10 +38,16 @@ * @return true on success */ define boolean ReadInstallInfItem(path install_inf, string item, string var) { - if(item == nil || item == "" || var == nil || var == "") return false; + if(item == nil || item == "" || var == nil || var == "") + return false; + string val = (string) SCR::Read(add(install_inf, var)); - if(val == nil) return false; - if(val != "") InstallInf[item] = val; + if(val == nil) + return false; + + if(val != "") + InstallInf[item] = val; + return true; } @@ -137,20 +143,21 @@ } else { - // FIXME: alias = eth0 tulip - // FIXME: options = ne io=0x200 + // FIXME: alias = eth0 tulip + // FIXME: options = ne io=0x200 - // #42203: correctly parse module and options for proposal - // "eth0 qeth" -> "qeth" - // FIXME: this only works for a single module - string mod = InstallInf["module"]:""; - if (mod != "") { - InstallInf["module"] = DeleteFirstWord (mod); - } - string options = InstallInf["options"]:""; - if (options != "") { - InstallInf["options"] = DeleteFirstWord (options); - } + // #42203: correctly parse module and options for proposal + // "eth0 qeth" -> "qeth" + // FIXME: this only works for a single module + string mod = InstallInf["module"]:""; + if (mod != "") { + InstallInf["module"] = DeleteFirstWord (mod); + } + + string options = InstallInf["options"]:""; + if (options != "") { + InstallInf["options"] = DeleteFirstWord (options); + } } y2milestone("InstallInf(%1)", InstallInf); @@ -180,65 +187,85 @@ map <string,any> hwcfg=$[]; void CreateIfcfg(){ - string network_configuration=""; - // set BOOTPROTO=[ static | dhcp ] - if (InstallInf["bootproto"]:"dhcp"=="static") { - // add broadcast interface #suse49131 - network_configuration=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", - InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); - } else { - network_configuration="BOOTPROTO='dhcp'\n"; - // set DHCP_SET_HOSTNAME=yes #suse30528 - y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); - SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); - } + string network_configuration=""; + // set BOOTPROTO=[ static | dhcp ] + if (InstallInf["bootproto"]:"dhcp"=="static") + { + // add broadcast interface #suse49131 + network_configuration=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", + InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); + } + else + { + network_configuration="BOOTPROTO='dhcp'\n"; + // set DHCP_SET_HOSTNAME=yes #suse30528 + y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); + SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); + } // wlan devices - if (size(InstallInf["WESSID"]:"")>0 || size(InstallInf["WAuth"]:"")>0 || size(InstallInf["WKey"]:"")>0 || size(InstallInf["WKeyType"]:"")>0 || size(InstallInf["WKeyLen"]:"")>0){ - network_configuration = sformat("%1WIRELESS_ESSID='%2'\n", network_configuration, InstallInf["WESSID"]:""); - network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); - network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); - network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:""); - if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) - network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:""); - } + if (size(InstallInf["WESSID"]:"")>0 || size(InstallInf["WAuth"]:"")>0 || + size(InstallInf["WKey"]:"")>0 || size(InstallInf["WKeyType"]:"")>0 || + size(InstallInf["WKeyLen"]:"")>0) + { + network_configuration = sformat("%1WIRELESS_ESSID='%2'\n", network_configuration, InstallInf["WESSID"]:""); + network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); + network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); + network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:""); + if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) + network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, + substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:""); + } + + + // if available, write MTU + if (size(InstallInf["mtu"]:"")>0) + network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); + + // for queth devices (s390) + if (size(InstallInf["LLADDR"]:"")>0) + network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); - // if available, write MTU - if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); + if (network_disk) + { + network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); + } + else + { + network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); + } - // for queth devices (s390) - if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); + // reference to hardware configuration + // network_configuration = sformat("%1_nm_name='%2'\n", network_configuration, hwcfg); + // point to point interface + if (size(InstallInf["remote_ip"]:"")>0) + network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); - if (network_disk){ network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); - } else{network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); - } + list<map> hardware=ReadHardware("netcard"); + y2milestone("hardware %1", hardware); + + string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - // reference to hardware configuration -// network_configuration = sformat("%1_nm_name='%2'\n", network_configuration, hwcfg); + string hw_name = BuildDescription(NetworkDevices::device_type(ifcfg), NetworkDevices::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware); + // protect special characters, #305343 + if (size(hw_name)>0) + network_configuration = sformat("%1NAME='%2'\n", network_configuration, String::Quote (hw_name)); - // point to point interface - if (size(InstallInf["remote_ip"]:"")>0)network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); - list<map> hardware=ReadHardware("netcard"); -y2internal("hardware %1", hardware); - -string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - - string hw_name = BuildDescription(NetworkDevices::device_type(ifcfg), NetworkDevices::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware); - if (size(hw_name)>0) network_configuration = sformat("%1NAME='%2'\n", network_configuration, hw_name); - - - y2milestone("Network Configuration:\n%1\nifcfg file: %2", network_configuration, ifcfg); - - // write only if file doesn't exists - string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); -// string dev_file=sformat("/tmp/%1", ifcfg); - if (!FileUtils::Exists(dev_file)) { - SCR::Write(.target.string, dev_file, network_configuration); - y2internal("ifcfg file: %1", dev_file); - } - else y2warning("File exists %1", dev_file); + y2milestone("Network Configuration:\n%1\nifcfg file: %2", network_configuration, ifcfg); + + // write only if file doesn't exists + string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); + // string dev_file=sformat("/tmp/%1", ifcfg); + + if (!FileUtils::Exists(dev_file)) + { + SCR::Write(.target.string, dev_file, network_configuration); + y2milestone("ifcfg file: %1", dev_file); + } + else + y2warning("File exists %1", dev_file); } /* @@ -248,53 +275,55 @@ void CreateOtherNetworkFiles(){ - // create hostname - if (size(InstallInf["hostname"]:"")>0){ - y2milestone("Write HOSTANAME: %1", InstallInf["hostname"]:""); - SCR::Write(.target.string, "/etc/HOSTNAME", InstallInf["hostname"]:""); - } - - if(InstallInf["bootproto"]:"dhcp"=="static") - { - // create routes file - if (size(InstallInf["gateway"]:"")>0){ - y2milestone("Writing route : %1", InstallInf["gateway"]:""); - SCR::Write(.target.string, "/etc/sysconfig/network/routes", sformat("default %1 - -\n", InstallInf["gateway"]:"")); - } else y2warning("No routing information in install.inf"); - - // create resolv.conf only for static configuration - if (size(InstallInf["nameserver"]:"")>0){ - string text = ""; - //Enter search domain data only if present - if( size(InstallInf["domain"]:"") > 0) - text=sformat("search %1\nnameserver %2\n", InstallInf["domain"]:"", InstallInf["nameserver"]:""); - else - //If we don't have search domain data, skip 'search' field, - //do not leave out 'nameserver' completely - #298001 - text = sformat("nameserver %1\n", InstallInf["nameserver"]:""); - y2milestone("Write resolv.conf content: %1", text); - SCR::Write(.target.string, "/etc/resolv.conf", text); - } - } - - // create proxy sysconfig file - if (size(InstallInf["proxy"]:"")>0) { - y2milestone("Writing proxy settings: %1", InstallInf["proxy"]:""); - map ex = Proxy::Export(); - Proxy::Read(); - Proxy::Import( ex ); - Proxy::Write(); - } - // create defaultdomain - if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ - y2milestone("Write defaultdomain: %1", InstallInf["nisdomain"]:""); - SCR::Write(.target.string, "/etc/defaultdomain", InstallInf["nisdomain"]:""); - } - - // write wait_for_interfaces if needed - if (size(InstallInf["connect_wait"]:"")>0){ - SCR::Execute(.target.bash_output, sformat("sed -i s/^WAIT_FOR_INTERFACES=.*/WAIT_FOR_INTERFACES=%1/g /etc/sysconfig/network/config", InstallInf["connect_wait"]:"")); - } + // create hostname + if (size(InstallInf["hostname"]:"")>0){ + y2milestone("Write HOSTANAME: %1", InstallInf["hostname"]:""); + SCR::Write(.target.string, "/etc/HOSTNAME", InstallInf["hostname"]:""); + } + + if(InstallInf["bootproto"]:"dhcp"=="static") + { + // create routes file + if (size(InstallInf["gateway"]:"")>0){ + y2milestone("Writing route : %1", InstallInf["gateway"]:""); + SCR::Write(.target.string, "/etc/sysconfig/network/routes", sformat("default %1 - -\n", InstallInf["gateway"]:"")); + } + else + y2warning("No routing information in install.inf"); + + // create resolv.conf only for static configuration + if (size(InstallInf["nameserver"]:"")>0){ + string text = ""; + //Enter search domain data only if present + if( size(InstallInf["domain"]:"") > 0) + text=sformat("search %1\nnameserver %2\n", InstallInf["domain"]:"", InstallInf["nameserver"]:""); + else + //If we don't have search domain data, skip 'search' field, + //do not leave out 'nameserver' completely - #298001 + text = sformat("nameserver %1\n", InstallInf["nameserver"]:""); + y2milestone("Write resolv.conf content: %1", text); + SCR::Write(.target.string, "/etc/resolv.conf", text); + } + } + + // create proxy sysconfig file + if (size(InstallInf["proxy"]:"")>0) { + y2milestone("Writing proxy settings: %1", InstallInf["proxy"]:""); + map ex = Proxy::Export(); + Proxy::Read(); + Proxy::Import( ex ); + Proxy::Write(); + } + // create defaultdomain + if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ + y2milestone("Write defaultdomain: %1", InstallInf["nisdomain"]:""); + SCR::Write(.target.string, "/etc/defaultdomain", InstallInf["nisdomain"]:""); + } + + // write wait_for_interfaces if needed + if (size(InstallInf["connect_wait"]:"")>0){ + SCR::Execute(.target.bash_output, sformat("sed -i s/^WAIT_FOR_INTERFACES=.*/WAIT_FOR_INTERFACES=%1/g /etc/sysconfig/network/config", InstallInf["connect_wait"]:"")); + } } /* @@ -302,80 +331,81 @@ */ void save_network(){ - // skip from chroot - integer old_SCR = WFM::SCRGetDefault (); - integer new_SCR = WFM::SCROpen ("chroot=/:scr", false); - WFM::SCRSetDefault (new_SCR); - - // when root is on nfs/iscsi set startmode=nfsroot #176804 - string device = NetworkStorage::getDevice( Installation::destdir ); - y2internal("%1 directory is on %2 device", Installation::destdir, device); - network_disk = NetworkStorage::isDiskOnNetwork( device ); - - // -------------------------------------------------------------- - // Copy DHCP client cache so that we can request the same IP (#43974). - WFM::Execute (.local.bash, sformat ( - "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", - "/var/lib/dhcpcd", - String::Quote (Installation::destdir))); - - //Deleting lockfiles and re-triggering udev events for *net is not needed any more - //(#292375 c#18) - - string udev_rules_srcdir = "/etc/udev/rules.d"; - string net_srcfile = "70-persistent-net.rules"; - string cd_srcfile = "70-persistent-cd.rules"; - - string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir); - string net_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, net_srcfile); - string cd_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, cd_srcfile); - - //Do not create udev_rules_destdir if it already exists (in case of update) - //(bug #293366, c#7) - - if (! FileUtils::Exists( udev_rules_destdir )) - { - y2milestone("%1 does not exist yet, creating it", udev_rules_destdir); - WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", udev_rules_destdir)); - } - - if (! FileUtils::Exists( net_destfile )) - { - y2milestone("Copying %1 to the installed system ", net_srcfile); - WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, net_srcfile, net_destfile)); - } - - if (! FileUtils::Exists( cd_destfile )) - { - y2milestone("Copying %1 to the installed system ", cd_srcfile); - WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, cd_srcfile, cd_destfile)); - } - - // close and chroot back - WFM::SCRClose (new_SCR); - WFM::SCRSetDefault (old_SCR); - - if (Mode::autoinst()){ - import "LanUdevAuto"; - LanUdevAuto::Write(); - } - - - if(ReadInstallInf()){ -// string hwcfgname = CreateHardwareFile(); -// string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - - CreateIfcfg(); - CreateOtherNetworkFiles(); - - SCR::Execute(.target.bash, "chkconfig network on"); - - // if portmap running - start it after reboot - WFM::Execute (.local.bash, - "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap"); + // skip from chroot + integer old_SCR = WFM::SCRGetDefault (); + integer new_SCR = WFM::SCROpen ("chroot=/:scr", false); + WFM::SCRSetDefault (new_SCR); + + // when root is on nfs/iscsi set startmode=nfsroot #176804 + string device = NetworkStorage::getDevice( Installation::destdir ); + y2internal("%1 directory is on %2 device", Installation::destdir, device); + network_disk = NetworkStorage::isDiskOnNetwork( device ); + + // -------------------------------------------------------------- + // Copy DHCP client cache so that we can request the same IP (#43974). + WFM::Execute (.local.bash, sformat ( + "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", + "/var/lib/dhcpcd", + String::Quote (Installation::destdir))); + + //Deleting lockfiles and re-triggering udev events for *net is not needed any more + //(#292375 c#18) + + string udev_rules_srcdir = "/etc/udev/rules.d"; + string net_srcfile = "70-persistent-net.rules"; + string cd_srcfile = "70-persistent-cd.rules"; + + string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir); + string net_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, net_srcfile); + string cd_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, cd_srcfile); + //Do not create udev_rules_destdir if it already exists (in case of update) + //(bug #293366, c#7) + + if (! FileUtils::Exists( udev_rules_destdir )) + { + y2milestone("%1 does not exist yet, creating it", udev_rules_destdir); + WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", udev_rules_destdir)); + } - } else + if (! FileUtils::Exists( net_destfile )) + { + y2milestone("Copying %1 to the installed system ", net_srcfile); + WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, net_srcfile, net_destfile)); + } + + if (! FileUtils::Exists( cd_destfile )) + { + y2milestone("Copying %1 to the installed system ", cd_srcfile); + WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, cd_srcfile, cd_destfile)); + } + + // close and chroot back + WFM::SCRClose (new_SCR); + WFM::SCRSetDefault (old_SCR); + + if (Mode::autoinst()){ + import "LanUdevAuto"; + LanUdevAuto::Write(); + } + + + if(ReadInstallInf()){ + // string hwcfgname = CreateHardwareFile(); + // string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); + + CreateIfcfg(); + CreateOtherNetworkFiles(); + + SCR::Execute(.target.bash, "chkconfig network on"); + + // if portmap running - start it after reboot + WFM::Execute (.local.bash, + "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap"); + + + } + else y2error("Error while reading install.inf!"); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.77/src/modules/DNS.ycp new/yast2-network-2.15.78/src/modules/DNS.ycp --- old/yast2-network-2.15.77/src/modules/DNS.ycp 2007-08-10 20:32:36.000000000 +0200 +++ new/yast2-network-2.15.78/src/modules/DNS.ycp 2007-09-20 18:40:03.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Hostname and DNS data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: DNS.ycp 40215 2007-08-10 18:32:35Z kmachalkova $ + * $Id: DNS.ycp 40999 2007-09-20 16:40:02Z kmachalkova $ * * Manages resolv.conf and (fully qualified) hostname, also * respecting DHCP. @@ -228,27 +228,19 @@ /* build FQ hostname */ string fqhostname = Hostname::MergeFQ(hostname, domain); - NetworkDevices::Read(); - // Take static network addresses. - // Watch out, there may be an unused IPADDR for a DHCP interface, #49055 - list<string> devs = - NetworkDevices::Locate ("BOOTPROTO", "static") + - NetworkDevices::Locate ("BOOTPROTO", ""); // static is the default - list<string> ips = maplist(string dev, devs, { - return NetworkDevices::GetValue(dev, "IPADDR"); - }); - if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false) + //We do not collect static IP addresses here, as hostnames + //are defined for each static IP separately in address dialog + //FaTE #2202 + + if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false) Host::write_hostname=false; else { - /* Update /etc/hosts, but only iff there are no static - IPs defined. Otherwise, hostnames are associated with - static IPs in address dialog - FaTE #2202 */ - if ( ips == [] ) - { - Host::Update(oldhostname, fqhostname, ips); - Host::Write(); - } + //Always add 127.0.0.2 entry to /etc/hosts, otherwise some + //desktop apps may hang, not being able to resolve hostname (#304632) + //empty list [] as third parameter does that + Host::Update(oldhostname, fqhostname, []); + Host::Write(); } oldhostname = fqhostname; // #49634 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.77/src/modules/Host.ycp new/yast2-network-2.15.78/src/modules/Host.ycp --- old/yast2-network-2.15.77/src/modules/Host.ycp 2007-08-10 20:32:36.000000000 +0200 +++ new/yast2-network-2.15.78/src/modules/Host.ycp 2007-09-20 18:40:03.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Hosts data (/etc/hosts) * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Host.ycp 40215 2007-08-10 18:32:35Z kmachalkova $ + * $Id: Host.ycp 40999 2007-09-20 16:40:02Z kmachalkova $ */ { @@ -225,6 +225,18 @@ } y2debug("Hosts: %1", hosts); + /* Add at least one hostname/ip */ + // but do not overload localhost (#46715) + if (write_hostname) { + if (size(ips) < 1 && nick != "localhost") { + y2milestone("Adding dummy 127.0.0.2 %1 entry", newhn); + // TODO #42102 + hosts["127.0.0.2"] = [ newhn + " " + nick ]; + y2milestone("Hosts: %1", hosts); + return true; + } + } + /* Remove old hostname from hosts */ // list oldhnlist = []; foreach (string ip, list<string> hs, hosts, { @@ -248,17 +260,7 @@ hosts["127.0.0.1"] = ["localhost"]; } - /* Add at least one hostname/ip */ - // but do not overload localhost (#46715) - if (write_hostname) - if (size(ips) < 1 && nick != "localhost") { - y2milestone("No IP found, adding dummy 127.0.0.2"); - // TODO #42102 - hosts["127.0.0.2"] = [ newhn + " " + nick ]; - y2milestone("Hosts: %1", hosts); - return true; - } - + /* Add hostname/ip for all ips */ boolean nickadded = false; maplist(string ip, ips, { @@ -266,7 +268,7 @@ /* Only add if not present yet */ // if(haskey(hosts, ip)) return; /* Omit some IP addresses */ - if(ip == "" || ip == nil || ip == "127.0.0.1" || ip == "127.0.0.2") return; + if(ip == "" || ip == nil || ip == "127.0.0.1" ) return; string name = newhn ; /* Add nick for the first one */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.77/VERSION new/yast2-network-2.15.78/VERSION --- old/yast2-network-2.15.77/VERSION 2007-09-18 14:57:35.000000000 +0200 +++ new/yast2-network-2.15.78/VERSION 2007-09-20 18:43:15.000000000 +0200 @@ -1 +1 @@ -2.15.77 +2.15.78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-trans-nb
by root＠Hilbert.suse.de 20 Sep '07

20 Sep '07

Hello community, here is the log from the commit of package yast2-trans-nb checked in at Thu Sep 20 23:04:15 CEST 2007. -------- --- yast2-trans-nb/yast2-trans-nb.changes 2007-08-27 16:54:08.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-nb/yast2-trans-nb.changes 2007-09-20 17:14:28.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 20 17:14:28 2007 - ke(a)suse.de + +- Update to version 2.15.10. + +------------------------------------------------------------------------ Old: ---- yast2-trans-nb-2.15.9.tar.bz2 New: ---- yast2-trans-nb-2.15.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-nb.spec ++++++ --- /var/tmp/diff_new_pack.G23060/_old 2007-09-20 23:04:12.000000000 +0200 +++ /var/tmp/diff_new_pack.G23060/_new 2007-09-20 23:04:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-nb (Version 2.15.9) +# spec file for package yast2-trans-nb (Version 2.15.10) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,16 +11,16 @@ # norootforbuild Name: yast2-trans-nb -Version: 2.15.9 +Version: 2.15.10 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-nb-2.15.9.tar.bz2 -prefix: /usr +Source0: yast2-trans-nb-2.15.10.tar.bz2 +Prefix: /usr Provides: locale(yast2:nb) BuildRequires: pkgconfig yast2-devtools -BuildArchitectures: noarch +BuildArch: noarch Summary: YaST2 - Norwegian Translations (Norwegian Bokmaal) %define Y2LANG nb @@ -28,7 +28,7 @@ YaST2 - Norwegian Translations (Norwegian Bokmaal) %prep -%setup -n yast2-trans-nb-2.15.9 +%setup -n yast2-trans-nb-2.15.10 %build autoreconf --force --install @@ -59,8 +59,9 @@ %doc %{prefix}/share/doc/packages/yast2-trans-nb %dir /usr/share/YaST2/locale %lang(nb) /usr/share/YaST2/locale/nb - %changelog +* Thu Sep 20 2007 - ke(a)suse.de +- Update to version 2.15.10. * Mon Aug 27 2007 - ke(a)suse.de - Update to version 2.15.9. * Fri Aug 24 2007 - ke(a)suse.de ++++++ yast2-trans-nb-2.15.9.tar.bz2 -> yast2-trans-nb-2.15.10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-nb-2.15.9/configure new/yast2-trans-nb-2.15.10/configure --- old/yast2-trans-nb-2.15.9/configure 2007-08-27 16:54:17.000000000 +0200 +++ new/yast2-trans-nb-2.15.10/configure 2007-09-20 17:14:38.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-trans-nb 2.15.9. +# Generated by GNU Autoconf 2.60 for yast2-trans-nb 2.15.10. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-nb' PACKAGE_TARNAME='yast2-trans-nb' -PACKAGE_VERSION='2.15.9' -PACKAGE_STRING='yast2-trans-nb 2.15.9' +PACKAGE_VERSION='2.15.10' +PACKAGE_STRING='yast2-trans-nb 2.15.10' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1186,7 +1186,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-trans-nb 2.15.9 to adapt to many kinds of systems. +\`configure' configures yast2-trans-nb 2.15.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1257,7 +1257,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-nb 2.15.9:";; + short | recursive ) echo "Configuration of yast2-trans-nb 2.15.10:";; esac cat <<\_ACEOF @@ -1337,7 +1337,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-trans-nb configure 2.15.9 +yast2-trans-nb configure 2.15.10 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1351,7 +1351,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-trans-nb $as_me 2.15.9, which was +It was created by yast2-trans-nb $as_me 2.15.10, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2152,7 +2152,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-nb' - VERSION='2.15.9' + VERSION='2.15.10' cat >>confdefs.h <<_ACEOF @@ -2379,7 +2379,7 @@ -VERSION="2.15.9" +VERSION="2.15.10" RPMNAME="yast2-trans-nb" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -3316,7 +3316,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-trans-nb $as_me 2.15.9, which was +This file was extended by yast2-trans-nb $as_me 2.15.10, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3359,7 +3359,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-trans-nb config.status 2.15.9 +yast2-trans-nb config.status 2.15.10 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-nb-2.15.9/configure.in new/yast2-trans-nb-2.15.10/configure.in --- old/yast2-trans-nb-2.15.9/configure.in 2007-08-27 16:54:13.000000000 +0200 +++ new/yast2-trans-nb-2.15.10/configure.in 2007-09-20 17:14:34.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-trans-nb, 2.15.9, http://bugs.opensuse.org/, yast2-trans-nb) +AC_INIT(yast2-trans-nb, 2.15.10, http://bugs.opensuse.org/, yast2-trans-nb) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.9" +VERSION="2.15.10" RPMNAME="yast2-trans-nb" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-nb-2.15.9/po/OneClickInstall.nb.po new/yast2-trans-nb-2.15.10/po/OneClickInstall.nb.po --- old/yast2-trans-nb-2.15.9/po/OneClickInstall.nb.po 2007-08-15 18:27:45.000000000 +0200 +++ new/yast2-trans-nb-2.15.10/po/OneClickInstall.nb.po 2007-09-20 16:37:57.000000000 +0200 @@ -1,4 +1,4 @@ -# translation of OneClickInstall.po to Norwegian +# translation of OneClickInstall.nb.po to Norwegian # translation of OneClickInstall.po to # Norwegian message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. @@ -9,10 +9,10 @@ # Rune Nordbøe Skillingstad <rune(a)skillingstad.no>, 2007. msgid "" msgstr "" -"Project-Id-Version: OneClickInstall\n" +"Project-Id-Version: OneClickInstall.nb\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-14 16:55+0200\n" -"PO-Revision-Date: 2007-08-15 16:53+0200\n" +"POT-Creation-Date: 2007-09-03 14:25+0200\n" +"PO-Revision-Date: 2007-09-17 15:31+0200\n" "Last-Translator: Rune Nordbøe Skillingstad <rune(a)skillingstad.no>\n" "Language-Team: Norwegian\n" "MIME-Version: 1.0\n" @@ -207,7 +207,11 @@ msgid "Nothing to do" msgstr "Ingenting kan endres" -#: src/OneClickInstallUI.ycp:501 +#: src/OneClickInstallUI.ycp:389 +msgid "Installation Steps" +msgstr "Installasjonstrinn" + +#: src/OneClickInstallUI.ycp:509 msgid "" "Have you reviewed the changes that will be made to your system?\n" "\n" @@ -217,39 +221,39 @@ "\n" "Tvilsomme pakker kan skade systemet." -#: src/OneClickInstallWorker.ycp:54 +#: src/OneClickInstallWorker.ycp:81 msgid "An error occurred while creating the installation source." msgstr "Det oppstod en feil under opprettelse av installasjonskilden." -#: src/OneClickInstallWorker.ycp:54 +#: src/OneClickInstallWorker.ycp:81 msgid "Details:" msgstr "Detaljer:" -#: src/OneClickInstallWorker.ycp:54 +#: src/OneClickInstallWorker.ycp:81 msgid "Try again?" msgstr "Vil du prøve igjen?" -#: src/OneClickInstallWorker.ycp:209 +#: src/OneClickInstallWorker.ycp:237 msgid "An error occurred while attempting to subscribe to the required repositories. Please review the yast2 logs for more information." msgstr "Det oppstod en feil under forsøk på å abonnere på valgte arkiver. Du finner mer informasjon i yast2-loggene." -#: src/OneClickInstallWorker.ycp:220 +#: src/OneClickInstallWorker.ycp:248 msgid "An error occurred while attempting to remove the specified packages. Please review the yast2 logs for more information." msgstr "Det oppstod en feil under forsøket på å fjerne valgte pakker. Du finner mer informasjon i yast2-loggene." -#: src/OneClickInstallWorker.ycp:231 +#: src/OneClickInstallWorker.ycp:259 msgid "An error occurred while attempting to install the specified patterns. Please review the yast2 logs for more information." msgstr "Det oppstod en feil under forsøket på å installere valgte mønstre. Du finner mer informasjon i yast2-loggene." -#: src/OneClickInstallWorker.ycp:242 +#: src/OneClickInstallWorker.ycp:270 msgid "An error occurred while attempting to install the specified packages. Please review the yast2 logs for more information." msgstr "Det oppstod en feil under forsøket på å installere valgte pakker. Du finner mer informasjon i yast2-loggene." -#: src/OneClickInstallWorker.ycp:253 +#: src/OneClickInstallWorker.ycp:281 msgid "An error occurred while attempting to unsubscribe from the repositories that were used to perform the installation. You can remove them manually in YaST > Software Repositories. Please review the yast2 logs for more information." msgstr "Det oppstod en feil under forsøket på å avslutte abonnementet på arkivene som ble brukt under installasjonen. Du kan fjerne dem manuelt under YaST > Installasjonskilder. Du finner mer informasjon i yast2-loggene." -#: src/OneClickInstallWorker.ycp:261 +#: src/OneClickInstallWorker.ycp:289 msgid "No error occurred." msgstr "Ingen feil har oppstått" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-nb-2.15.9/po/status.txt new/yast2-trans-nb-2.15.10/po/status.txt --- old/yast2-trans-nb-2.15.9/po/status.txt 2007-08-27 15:59:45.000000000 +0200 +++ new/yast2-trans-nb-2.15.10/po/status.txt 2007-09-20 16:40:23.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17995 +Translated : 17996 Fuzzy : 0 Untranslated : 0 -------------------- - All strings : 17995 + All strings : 17996 100 % are translated diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-nb-2.15.9/VERSION new/yast2-trans-nb-2.15.10/VERSION --- old/yast2-trans-nb-2.15.9/VERSION 2007-08-27 16:54:08.000000000 +0200 +++ new/yast2-trans-nb-2.15.10/VERSION 2007-09-20 17:14:28.000000000 +0200 @@ -1 +1 @@ -2.15.9 +2.15.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-trans-km
by root＠Hilbert.suse.de 20 Sep '07

20 Sep '07

Hello community, here is the log from the commit of package yast2-trans-km checked in at Thu Sep 20 23:04:05 CEST 2007. -------- --- yast2-trans-km/yast2-trans-km.changes 2007-09-17 14:13:13.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-trans-km/yast2-trans-km.changes 2007-09-20 17:26:50.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 20 17:26:50 2007 - ke(a)suse.de + +- Update to version 2.15.23. + +------------------------------------------------------------------------ Old: ---- yast2-trans-km-2.15.22.tar.bz2 New: ---- yast2-trans-km-2.15.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-km.spec ++++++ --- /var/tmp/diff_new_pack.z21981/_old 2007-09-20 23:04:02.000000000 +0200 +++ /var/tmp/diff_new_pack.z21981/_new 2007-09-20 23:04:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-km (Version 2.15.22) +# spec file for package yast2-trans-km (Version 2.15.23) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-km -Version: 2.15.22 +Version: 2.15.23 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-km-2.15.22.tar.bz2 +Source0: yast2-trans-km-2.15.23.tar.bz2 Prefix: /usr Provides: locale(yast2:km) BuildRequires: pkgconfig yast2-devtools @@ -30,7 +30,7 @@ %prep -%setup -n yast2-trans-km-2.15.22 +%setup -n yast2-trans-km-2.15.23 %build autoreconf --force --install @@ -61,8 +61,9 @@ %doc %{prefix}/share/doc/packages/yast2-trans-km %dir /usr/share/YaST2/locale %lang(km) /usr/share/YaST2/locale/km - %changelog +* Thu Sep 20 2007 - ke(a)suse.de +- Update to version 2.15.23. * Mon Sep 17 2007 - ke(a)suse.de - Update to version 2.15.22. * Thu Sep 13 2007 - ke(a)suse.de ++++++ yast2-trans-km-2.15.22.tar.bz2 -> yast2-trans-km-2.15.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-km-2.15.22/configure new/yast2-trans-km-2.15.23/configure --- old/yast2-trans-km-2.15.22/configure 2007-09-17 14:13:22.000000000 +0200 +++ new/yast2-trans-km-2.15.23/configure 2007-09-20 17:27:00.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-trans-km 2.15.22. +# Generated by GNU Autoconf 2.60 for yast2-trans-km 2.15.23. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-trans-km' PACKAGE_TARNAME='yast2-trans-km' -PACKAGE_VERSION='2.15.22' -PACKAGE_STRING='yast2-trans-km 2.15.22' +PACKAGE_VERSION='2.15.23' +PACKAGE_STRING='yast2-trans-km 2.15.23' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1186,7 +1186,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-trans-km 2.15.22 to adapt to many kinds of systems. +\`configure' configures yast2-trans-km 2.15.23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1257,7 +1257,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-trans-km 2.15.22:";; + short | recursive ) echo "Configuration of yast2-trans-km 2.15.23:";; esac cat <<\_ACEOF @@ -1337,7 +1337,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-trans-km configure 2.15.22 +yast2-trans-km configure 2.15.23 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1351,7 +1351,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-trans-km $as_me 2.15.22, which was +It was created by yast2-trans-km $as_me 2.15.23, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2152,7 +2152,7 @@ # Define the identity of the package. PACKAGE='yast2-trans-km' - VERSION='2.15.22' + VERSION='2.15.23' cat >>confdefs.h <<_ACEOF @@ -2379,7 +2379,7 @@ -VERSION="2.15.22" +VERSION="2.15.23" RPMNAME="yast2-trans-km" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" @@ -3316,7 +3316,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-trans-km $as_me 2.15.22, which was +This file was extended by yast2-trans-km $as_me 2.15.23, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3359,7 +3359,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-trans-km config.status 2.15.22 +yast2-trans-km config.status 2.15.23 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-km-2.15.22/configure.in new/yast2-trans-km-2.15.23/configure.in --- old/yast2-trans-km-2.15.22/configure.in 2007-09-17 14:13:18.000000000 +0200 +++ new/yast2-trans-km-2.15.23/configure.in 2007-09-20 17:26:56.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-trans-km, 2.15.22, http://bugs.opensuse.org/, yast2-trans-km) +AC_INIT(yast2-trans-km, 2.15.23, http://bugs.opensuse.org/, yast2-trans-km) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.22" +VERSION="2.15.23" RPMNAME="yast2-trans-km" MAINTAINER="Karl Eichwalder <ke(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-km-2.15.22/po/autoinst.km.po new/yast2-trans-km-2.15.23/po/autoinst.km.po --- old/yast2-trans-km-2.15.22/po/autoinst.km.po 2007-09-17 11:54:28.000000000 +0200 +++ new/yast2-trans-km-2.15.23/po/autoinst.km.po 2007-09-20 16:48:25.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: autoinst.km\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-10 13:39+0200\n" -"PO-Revision-Date: 2007-09-14 11:46+0700\n" +"PO-Revision-Date: 2007-09-18 07:41+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-km-2.15.22/po/base.km.po new/yast2-trans-km-2.15.23/po/base.km.po --- old/yast2-trans-km-2.15.22/po/base.km.po 2007-09-17 11:54:31.000000000 +0200 +++ new/yast2-trans-km-2.15.23/po/base.km.po 2007-09-20 16:48:29.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: base.km\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-10 14:06+0200\n" -"PO-Revision-Date: 2007-09-14 11:46+0700\n" +"PO-Revision-Date: 2007-09-18 07:42+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-km-2.15.22/po/cd-creator.km.po new/yast2-trans-km-2.15.23/po/cd-creator.km.po --- old/yast2-trans-km-2.15.22/po/cd-creator.km.po 2007-09-17 11:54:39.000000000 +0200 +++ new/yast2-trans-km-2.15.23/po/cd-creator.km.po 2007-09-20 16:48:37.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: cd-creator.km\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-10 13:40+0200\n" -"PO-Revision-Date: 2007-09-14 11:47+0700\n" +"PO-Revision-Date: 2007-09-18 07:42+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-km-2.15.22/po/control-center.km.po new/yast2-trans-km-2.15.23/po/control-center.km.po --- old/yast2-trans-km-2.15.22/po/control-center.km.po 2007-09-17 11:54:40.000000000 +0200 +++ new/yast2-trans-km-2.15.23/po/control-center.km.po 2007-09-20 16:48:39.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: control-center.km\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-10 13:39+0200\n" -"PO-Revision-Date: 2007-09-14 11:47+0700\n" +"PO-Revision-Date: 2007-09-18 07:42+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-km-2.15.22/po/printer.km.po new/yast2-trans-km-2.15.23/po/printer.km.po --- old/yast2-trans-km-2.15.22/po/printer.km.po 2007-09-17 11:55:48.000000000 +0200 +++ new/yast2-trans-km-2.15.23/po/printer.km.po 2007-09-20 16:50:01.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: printer.km\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-10 13:44+0200\n" -"PO-Revision-Date: 2007-09-14 11:47+0700\n" +"PO-Revision-Date: 2007-09-18 07:42+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-km-2.15.22/po/product-creator.km.po new/yast2-trans-km-2.15.23/po/product-creator.km.po --- old/yast2-trans-km-2.15.22/po/product-creator.km.po 2007-09-17 11:55:49.000000000 +0200 +++ new/yast2-trans-km-2.15.23/po/product-creator.km.po 2007-09-20 16:50:02.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: product-creator.km\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-10 14:04+0200\n" -"PO-Revision-Date: 2007-09-14 11:47+0700\n" +"PO-Revision-Date: 2007-09-18 07:43+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-km-2.15.22/po/profile-manager.km.po new/yast2-trans-km-2.15.23/po/profile-manager.km.po --- old/yast2-trans-km-2.15.22/po/profile-manager.km.po 2007-09-17 11:55:51.000000000 +0200 +++ new/yast2-trans-km-2.15.23/po/profile-manager.km.po 2007-09-20 16:50:04.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: profile-manager.km\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-10 13:45+0200\n" -"PO-Revision-Date: 2007-09-14 11:48+0700\n" +"PO-Revision-Date: 2007-09-18 07:43+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-trans-km-2.15.22/VERSION new/yast2-trans-km-2.15.23/VERSION --- old/yast2-trans-km-2.15.22/VERSION 2007-09-17 14:13:13.000000000 +0200 +++ new/yast2-trans-km-2.15.23/VERSION 2007-09-20 17:26:50.000000000 +0200 @@ -1 +1 @@ -2.15.22 +2.15.23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠Hilbert.suse.de 20 Sep '07

20 Sep '07

Hello community, here is the log from the commit of package yast2-bootloader checked in at Thu Sep 20 23:04:01 CEST 2007. -------- --- yast2-bootloader/yast2-bootloader.changes 2007-09-18 10:04:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-09-20 21:02:18.245755000 +0200 @@ -1,0 +2,16 @@ +Thu Sep 20 21:00:14 CEST 2007 - od(a)suse.de + +- log the contents of the perl-BL_delayed_exec script (#309837) +- 2.15.24 + +------------------------------------------------------------------- +Thu Sep 20 18:44:06 CEST 2007 - od(a)suse.de + +- ckornacker(a)suse.de: added PREFIX to Makefile.cvs +- when bootloader_entry saved (during kernel postuninstall) a + command in /boot/perl-BL_delayed_exec for delayed execution in + the target system, run that script to remove old sections + (#309837) +- 2.15.23 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.15.22.tar.bz2 New: ---- yast2-bootloader-2.15.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.G20440/_old 2007-09-20 23:03:57.000000000 +0200 +++ /var/tmp/diff_new_pack.G20440/_new 2007-09-20 23:03:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.15.22) +# spec file for package yast2-bootloader (Version 2.15.24) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.15.22 +Version: 2.15.24 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.15.22.tar.bz2 +Source0: yast2-bootloader-2.15.24.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: @@ -50,7 +50,7 @@ Olaf Dabrunz %prep -%setup -n yast2-bootloader-2.15.22 +%setup -n yast2-bootloader-2.15.24 %build %{prefix}/bin/y2tool y2autoconf @@ -93,8 +93,17 @@ /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc - %changelog +* Thu Sep 20 2007 - od(a)suse.de +- log the contents of the perl-BL_delayed_exec script (#309837) +- 2.15.24 +* Thu Sep 20 2007 - od(a)suse.de +- ckornacker(a)suse.de: added PREFIX to Makefile.cvs +- when bootloader_entry saved (during kernel postuninstall) a + command in /boot/perl-BL_delayed_exec for delayed execution in + the target system, run that script to remove old sections + (#309837) +- 2.15.23 * Tue Sep 18 2007 - od(a)suse.de - update the default entry during update when the comment with the former default exists, even if the current default is valid ++++++ yast2-bootloader-2.15.22.tar.bz2 -> yast2-bootloader-2.15.24.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.22/src/modules/BootELILO.ycp new/yast2-bootloader-2.15.24/src/modules/BootELILO.ycp --- old/yast2-bootloader-2.15.22/src/modules/BootELILO.ycp 2007-08-31 12:05:43.000000000 +0200 +++ new/yast2-bootloader-2.15.24/src/modules/BootELILO.ycp 2007-09-20 18:43:08.000000000 +0200 @@ -16,7 +16,7 @@ * Andreas Schwab <schwab(a)suse.de> * Philipp Thomas <pth(a)suse.de> * - * $Id: BootELILO.ycp 40623 2007-08-30 13:49:53Z pth $ + * $Id: BootELILO.ycp 41000 2007-09-20 16:43:07Z odabrunz $ * */ @@ -391,6 +391,8 @@ BootCommon::globals["timeout"] = "8"; BootCommon::globals["append"] = BootArch::DefaultKernelParams (""); + // perl-BL delayed section removal + BootCommon::RunDelayedUpdates (); BootCommon::UpdateSections (true, CreateLinuxSection); // FIXME EFI entry name } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.22/src/modules/BootGRUB.ycp new/yast2-bootloader-2.15.24/src/modules/BootGRUB.ycp --- old/yast2-bootloader-2.15.22/src/modules/BootGRUB.ycp 2007-09-13 05:28:04.000000000 +0200 +++ new/yast2-bootloader-2.15.24/src/modules/BootGRUB.ycp 2007-09-20 18:43:08.000000000 +0200 @@ -14,7 +14,7 @@ * Joachim Plack <jplack(a)suse.de> * Philipp Thomas <pth(a)suse.de> * - * $Id: BootGRUB.ycp 40883 2007-09-13 03:28:03Z odabrunz $ + * $Id: BootGRUB.ycp 41000 2007-09-20 16:43:07Z odabrunz $ * */ @@ -957,6 +957,8 @@ */ global define void Update () { BootCommon::UpdateDeviceMap (); + // perl-BL delayed section removal + BootCommon::RunDelayedUpdates (); BootCommon::UpdateSections (true, CreateLinuxSection); BootCommon::UpdateGlobals (); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.22/src/modules/BootLILO.ycp new/yast2-bootloader-2.15.24/src/modules/BootLILO.ycp --- old/yast2-bootloader-2.15.22/src/modules/BootLILO.ycp 2007-08-31 12:05:43.000000000 +0200 +++ new/yast2-bootloader-2.15.24/src/modules/BootLILO.ycp 2007-09-20 18:43:09.000000000 +0200 @@ -13,7 +13,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Philipp Thomas <pth(a)suse.de> * - * $Id: BootLILO.ycp 40623 2007-08-30 13:49:53Z pth $ + * $Id: BootLILO.ycp 41000 2007-09-20 16:43:07Z odabrunz $ * */ @@ -198,6 +198,8 @@ */ global void Update () { BootCommon::UpdateDeviceMap (); + // perl-BL delayed section removal + BootCommon::RunDelayedUpdates (); BootCommon::UpdateSections (true, BootCommon::CreateLinuxSection); BootCommon::UpdateGlobals (); BootCommon::loader_device diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.22/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.15.24/src/modules/BootPOWERLILO.ycp --- old/yast2-bootloader-2.15.22/src/modules/BootPOWERLILO.ycp 2007-08-31 12:05:43.000000000 +0200 +++ new/yast2-bootloader-2.15.24/src/modules/BootPOWERLILO.ycp 2007-09-20 18:43:10.000000000 +0200 @@ -16,7 +16,7 @@ * Olaf Dabrunz <od(a)suse.de> * Philipp Thomas <pth(a)suse.de> * - * $Id: BootPOWERLILO.ycp 40623 2007-08-30 13:49:53Z pth $ + * $Id: BootPOWERLILO.ycp 41000 2007-09-20 16:43:07Z odabrunz $ * */ @@ -969,6 +969,9 @@ */ global void Update () { + // perl-BL delayed section removal + BootCommon::RunDelayedUpdates (); + /** * Firstly update sections of bootloader configuration and modify internal * structures as needed. This means right now: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.22/src/routines/lilolike.ycp new/yast2-bootloader-2.15.24/src/routines/lilolike.ycp --- old/yast2-bootloader-2.15.22/src/routines/lilolike.ycp 2007-09-18 10:03:29.000000000 +0200 +++ new/yast2-bootloader-2.15.24/src/routines/lilolike.ycp 2007-09-20 20:59:33.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: lilolike.ycp 40952 2007-09-18 08:03:27Z odabrunz $ + * $Id: lilolike.ycp 41005 2007-09-20 18:59:32Z odabrunz $ * */ { @@ -364,6 +364,29 @@ /** + * Run delayed updates + * + * This is used by perl-Bootloader when it cannot remove sections from the + * bootloader configuration from the postuninstall-script of the kernel. It + * writes a command to a delayed update script that is then called here to + * remove these sections. + * + * The script is deleted after execution. + */ +global void RunDelayedUpdates () { + string scriptname = "/boot/perl-BL_delayed_exec"; + string cmd = sformat("test -x %1 && { cat %1 ; %1 ; }", scriptname); + + y2milestone ("running delayed update command: %1", cmd); + map out = (map)SCR::Execute (.target.bash_output, cmd); + y2milestone ("command returned %1", out); + + cmd = sformat("rm -f %1", scriptname); + out = (map)SCR::Execute (.target.bash_output, cmd); +} + + +/** * fallback list for kernel flavors (adapted from Kernel.ycp), used if we have * no better information * order is from special to general, but prefer "default" in favor of "xen" @@ -871,7 +894,8 @@ && ! contains (recreated, label)) || key == "chainloader") { - string device = s[key]:""; + string device = (string) s[key]:nil; + y2milestone ("Checking for update: device %1 of key %2, section %3", device, key, label); if (device != nil) { y2milestone ("Updating root/other device of section %1", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.22/VERSION new/yast2-bootloader-2.15.24/VERSION --- old/yast2-bootloader-2.15.22/VERSION 2007-09-18 10:03:46.000000000 +0200 +++ new/yast2-bootloader-2.15.24/VERSION 2007-09-20 21:00:07.000000000 +0200 @@ -1 +1 @@ -2.15.22 +2.15.24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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