Hello community,
here is the log from the commit of package yast2-storage
checked in at Wed Oct 31 17:24:37 CET 2007.
--------
--- yast2-storage/yast2-storage.changes 2007-10-23 12:53:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-10-31 17:16:58.740836000 +0100
@@ -1,0 +2,17 @@
+Wed Oct 31 16:56:34 CET 2007 - aschnell@suse.de
+
+- adapted to changes concerning Update.ycp and Installation.ycp
+
+-------------------------------------------------------------------
+Thu Oct 25 17:55:57 CEST 2007 - fehr@suse.de
+
+- fix problem when more than one device name translation could be
+ applied (#332520)
+
+-------------------------------------------------------------------
+Thu Oct 25 15:07:31 CEST 2007 - fehr@suse.de
+
+- force "partitions" in DEVICE line of mdadm.conf during update if
+ device names changed (#331604)
+
+-------------------------------------------------------------------
@@ -4 +21 @@
-- make StorageDevice initializion delayed (#335582)
+- make StorageDevice initialization delayed (#335582)
Old:
----
yast2-storage-2.16.1.tar.bz2
New:
----
yast2-storage-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.H18076/_old 2007-10-31 17:24:00.000000000 +0100
+++ /var/tmp/diff_new_pack.H18076/_new 2007-10-31 17:24:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.16.1)
+# spec file for package yast2-storage (Version 2.16.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,19 +11,18 @@
# norootforbuild
Name: yast2-storage
-Version: 2.16.1
+Version: 2.16.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.16.1.tar.bz2
+Source0: yast2-storage-2.16.2.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
-# Requires: yast2-update
Requires: parted yast2-installation yast2-storage-lib yast2-perl-bindings autoyast2-installation mdadm lvm2 dmraid kpartx cryptsetup
# proc_meminfo.scr moved to yast2-2.15.23
-Requires: yast2 >= 2.15.23
+# Installation::installedVersion and Installation::updateVersion
+Requires: yast2 >= 2.16.4
%ifarch s390 s390x
Requires: yast2-s390
%endif
@@ -44,7 +43,7 @@
%prep
-%setup -n yast2-storage-2.16.1
+%setup -n yast2-storage-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -173,8 +172,16 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Wed Oct 31 2007 - aschnell@suse.de
+- adapted to changes concerning Update.ycp and Installation.ycp
+* Thu Oct 25 2007 - fehr@suse.de
+- fix problem when more than one device name translation could be
+ applied (#332520)
+* Thu Oct 25 2007 - fehr@suse.de
+- force "partitions" in DEVICE line of mdadm.conf during update if
+ device names changed (#331604)
* Tue Oct 23 2007 - fehr@suse.de
-- make StorageDevice initializion delayed (#335582)
+- make StorageDevice initialization delayed (#335582)
- version 2.16.1
* Wed Oct 10 2007 - fehr@suse.de
- if ntfs-3g mount fails during install just use a ntfs mount
++++++ yast2-storage-2.16.1.tar.bz2 -> yast2-storage-2.16.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.1/configure new/yast2-storage-2.16.2/configure
--- old/yast2-storage-2.16.1/configure 2007-08-28 15:51:12.000000000 +0200
+++ new/yast2-storage-2.16.2/configure 2007-10-31 17:01:36.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-storage 2.15.22.
+# Generated by GNU Autoconf 2.61 for yast2-storage 2.16.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.15.22'
-PACKAGE_STRING='yast2-storage 2.15.22'
+PACKAGE_VERSION='2.16.2'
+PACKAGE_STRING='yast2-storage 2.16.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1447,7 +1447,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-storage 2.15.22 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.16.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1518,7 +1518,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.15.22:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.16.2:";;
esac
cat <<\_ACEOF
@@ -1628,7 +1628,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.15.22
+yast2-storage configure 2.16.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1642,7 +1642,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-storage $as_me 2.15.22, which was
+It was created by yast2-storage $as_me 2.16.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2463,7 +2463,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.15.22'
+ VERSION='2.16.2'
cat >>confdefs.h <<_ACEOF
@@ -2690,7 +2690,7 @@
-VERSION="2.15.22"
+VERSION="2.16.2"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr "
@@ -21282,7 +21282,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-storage $as_me 2.15.22, which was
+This file was extended by yast2-storage $as_me 2.16.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21335,7 +21335,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-storage config.status 2.15.22
+yast2-storage config.status 2.16.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.1/configure.in new/yast2-storage-2.16.2/configure.in
--- old/yast2-storage-2.16.1/configure.in 2007-08-28 15:50:45.000000000 +0200
+++ new/yast2-storage-2.16.2/configure.in 2007-10-31 17:01:26.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-storage
dnl
-dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.15.22, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.16.2, http://bugs.opensuse.org/, yast2-storage)
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.16.2"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.1/Makefile.am new/yast2-storage-2.16.2/Makefile.am
--- old/yast2-storage-2.16.1/Makefile.am 2007-08-28 15:50:47.000000000 +0200
+++ new/yast2-storage-2.16.2/Makefile.am 2007-10-31 17:01:26.000000000 +0100
@@ -30,7 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.1/Makefile.in new/yast2-storage-2.16.2/Makefile.in
--- old/yast2-storage-2.16.1/Makefile.in 2007-08-28 15:51:34.000000000 +0200
+++ new/yast2-storage-2.16.2/Makefile.in 2007-10-31 17:01:42.000000000 +0100
@@ -88,8 +88,8 @@
{ test ! -d $(distdir) \
|| { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
@@ -260,7 +260,7 @@
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
@@ -582,7 +582,6 @@
$(am__remove_distdir)
dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.1/README new/yast2-storage-2.16.2/README
--- old/yast2-storage-2.16.1/README 2007-10-24 16:30:15.000000000 +0200
+++ new/yast2-storage-2.16.2/README 2007-10-31 17:15:45.000000000 +0100
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYRIGHT.english for license terms
+See the file COPYING for license terms
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.1/storage/src/modules/Storage.ycp new/yast2-storage-2.16.2/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.16.1/storage/src/modules/Storage.ycp 2007-10-24 16:28:37.000000000 +0200
+++ new/yast2-storage-2.16.2/storage/src/modules/Storage.ycp 2007-10-26 12:45:53.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 41520 2007-10-23 10:51:49Z fehr $
+ * $Id: Storage.ycp 41578 2007-10-25 16:16:22Z fehr $
*/
{
@@ -5149,7 +5149,7 @@
global define void UpdateFstabDiskmap( map diskmap )
``{
- y2milestone( "UpdateFstabdiskmap map %1", diskmap );
+ y2milestone( "UpdateFstabDiskmap map %1", diskmap );
string tabpath = PathToDestdir( "/etc/fstab" );
map fstab = Partitions::GetFstab( tabpath );
integer line = 0;
@@ -5181,6 +5181,30 @@
AsciiFile::RewriteFile( crtab, tabpath );
}
+global define void UpdateMdadm()
+ ``{
+ y2milestone( "UpdateMdadm" );
+ string cpath = PathToDestdir( "/etc/mdadm.conf" );
+ map file = $[];
+ AsciiFile::SetComment( file, "^[ \t]*#" );
+ AsciiFile::ReadFile( file, cpath );
+ integer line = 0;
+ boolean changed = false;
+ while( line<=AsciiFile::NumLines( file ) )
+ {
+ if( search( file["l",line,"line"]:"", "DEVICE" )!=nil &&
+ search( file["l",line,"line"]:"", "/dev/" )!=nil )
+ {
+ changed = true;
+ file["l",line,"line"] = "DEVICE partitions";
+ y2milestone( "UpdateMdadm %1", file["l",line]:$[] );
+ }
+ line = line+1;
+ }
+ if( changed )
+ AsciiFile::RewriteFile( file, cpath );
+ }
+
global define void UpdateCryptoType()
``{
y2milestone( "UpdateCryptoType" );
@@ -5327,6 +5351,7 @@
if( size(dm)>0 )
{
UpdateFstabDiskmap( dm );
+ UpdateMdadm();
}
if( oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0<=2))
{
@@ -5377,16 +5402,16 @@
map dm = BuildDiskmap( oldv );
if( size(dm)>0 )
{
- ret = maplist( string n, names, ``(HdDiskMap( n, dm )));
+ ret = maplist( string n, ret, ``(HdDiskMap( n, dm )));
}
if( (oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0==0)) &&
Arch::board_iseries () )
{
- ret = maplist( string n, names, ``(HdToIseries( n )));
+ ret = maplist( string n, ret, ``(HdToIseries( n )));
}
if( oldv["major"]:0==9 )
{
- ret = maplist( string n, names, ``(SLES9PersistentDevNames( n )));
+ ret = maplist( string n, ret, ``(SLES9PersistentDevNames( n )));
}
y2milestone( "GetTranslatedDevices ret %1", ret );
return( ret );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.1/storage/src/storage_finish.ycp new/yast2-storage-2.16.2/storage/src/storage_finish.ycp
--- old/yast2-storage-2.16.1/storage/src/storage_finish.ycp 2007-05-23 12:45:16.000000000 +0200
+++ new/yast2-storage-2.16.2/storage/src/storage_finish.ycp 2007-10-31 17:00:50.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: storage_finish.ycp 37520 2007-04-17 16:13:39Z fehr $
+ * $Id: storage_finish.ycp 41694 2007-10-31 16:02:01Z aschnell $
*
*/
@@ -19,7 +19,6 @@
import "Storage";
import "Mode";
import "Installation";
-import "Update";
import "Initrd";
include "installation/misc.ycp";
@@ -70,7 +69,7 @@
}
else
{
- Storage::Update (Update::installedVersion, Update::updateVersion);
+ Storage::Update (Installation::installedVersion, Installation::updateVersion);
}
if (Storage::CheckForLvmRootFs() )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.1/VERSION new/yast2-storage-2.16.2/VERSION
--- old/yast2-storage-2.16.1/VERSION 2007-10-23 12:52:52.000000000 +0200
+++ new/yast2-storage-2.16.2/VERSION 2007-10-31 17:00:58.000000000 +0100
@@ -1 +1 @@
-2.16.1
+2.16.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org