Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu May 24 12:26:17 CEST 2007.
--------
--- yast2-storage/yast2-storage.changes 2007-05-14 17:18:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-05-24 12:22:45.000000000 +0200
@@ -1,0 +2,25 @@
+Thu May 24 11:25:44 CEST 2007 - fehr@suse.de
+
+- add evms-devel to needforbuild
+- version 2.15.13
+
+-------------------------------------------------------------------
+Mon May 21 12:24:12 CEST 2007 - fehr@suse.de
+
+- handle very small devices where parted detects number of cylinders
+ as zero (#275959)
+
+-------------------------------------------------------------------
+Wed May 16 13:08:06 CEST 2007 - fehr@suse.de
+
+- add text about not moving progress bar when resizing (#274720)
+- overwrite newly created md devices as partitions (#266538)
+- handle EVMS over md correctly in GetUsedEvmsDisks (#266538)
+
+-------------------------------------------------------------------
+Tue May 15 17:41:49 CEST 2007 - fehr@suse.de
+
+- correctly compute maximal allowable cylinder (#273286)
+- fix bug in member function equalContent (#245734)
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.15.12.tar.bz2
New:
----
yast2-storage-2.15.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.A29430/_old 2007-05-24 12:26:08.000000000 +0200
+++ /var/tmp/diff_new_pack.A29430/_new 2007-05-24 12:26:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.15.12)
+# spec file for package yast2-storage (Version 2.15.13)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,14 +11,14 @@
# norootforbuild
Name: yast2-storage
-Version: 2.15.12
+Version: 2.15.13
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.15.12.tar.bz2
+Source0: yast2-storage-2.15.13.tar.bz2
prefix: /usr
-BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms 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
+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
@@ -44,7 +44,7 @@
%prep
-%setup -n yast2-storage-2.15.12
+%setup -n yast2-storage-2.15.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -169,6 +169,19 @@
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Thu May 24 2007 - fehr@suse.de
+- add evms-devel to needforbuild
+- version 2.15.13
+* Mon May 21 2007 - fehr@suse.de
+- handle very small devices where parted detects number of cylinders
+ as zero (#275959)
+* Wed May 16 2007 - fehr@suse.de
+- add text about not moving progress bar when resizing (#274720)
+- overwrite newly created md devices as partitions (#266538)
+- handle EVMS over md correctly in GetUsedEvmsDisks (#266538)
+* Tue May 15 2007 - fehr@suse.de
+- correctly compute maximal allowable cylinder (#273286)
+- fix bug in member function equalContent (#245734)
* Mon May 14 2007 - fehr@suse.de
- adapt to new parted version 1.8.7 ("linux-swap(new)" instead of
"linux-swap")
++++++ yast2-storage-2.15.12.tar.bz2 -> yast2-storage-2.15.13.tar.bz2 ++++++
++++ 6567 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/configure.in new/yast2-storage-2.15.13/configure.in
--- old/yast2-storage-2.15.12/configure.in 2007-03-13 09:53:08.000000000 +0100
+++ new/yast2-storage-2.15.13/configure.in 2007-05-23 12:46:50.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.15.5, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.15.12, 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.5"
+VERSION="2.15.12"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/Disk.cc new/yast2-storage-2.15.13/libstorage/src/Disk.cc
--- old/yast2-storage-2.15.12/libstorage/src/Disk.cc 2007-05-14 10:09:10.000000000 +0200
+++ new/yast2-storage-2.15.13/libstorage/src/Disk.cc 2007-05-23 13:07:58.000000000 +0200
@@ -346,11 +346,16 @@
list<string> geo = splitString( extractNthWord( 0, tmp ), "," );
list<string>::const_iterator i = geo.begin();
unsigned long val = 0;
+ bool sect_head_changed = false;
+ bool cyl_changed = false;
if( i!=geo.end() )
{
*i >> val;
if( val>0 )
+ {
c = val;
+ cyl_changed = true;
+ }
}
++i;
val = 0;
@@ -358,7 +363,10 @@
{
*i >> val;
if( val>0 )
+ {
h = (unsigned)val;
+ sect_head_changed = true;
+ }
}
++i;
val = 0;
@@ -366,7 +374,17 @@
{
*i >> val;
if( val>0 )
+ {
s = (unsigned)val;
+ sect_head_changed = true;
+ }
+ }
+ if( !cyl_changed && sect_head_changed )
+ {
+ c = sizeK()*2/(s*h);
+ if( c<=0 )
+ c=1;
+ y2mil( "new c:" << c );
}
y2milestone( "line:%s", line.c_str() );
y2milestone( "c:%lu h:%u s:%u", c, h, s );
@@ -2665,7 +2683,7 @@
++i;
++j;
}
- ret == ret && i==p.end() && j==pc.end();
+ ret = ret && i==p.end() && j==pc.end();
}
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/DmCo.cc new/yast2-storage-2.15.13/libstorage/src/DmCo.cc
--- old/yast2-storage-2.15.12/libstorage/src/DmCo.cc 2006-12-18 12:02:04.000000000 +0100
+++ new/yast2-storage-2.15.13/libstorage/src/DmCo.cc 2007-05-23 12:45:15.000000000 +0200
@@ -364,7 +364,7 @@
++i;
++j;
}
- ret == ret && i==p.end() && j==pc.end();
+ ret = ret && i==p.end() && j==pc.end();
}
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/DmPartCo.cc new/yast2-storage-2.15.13/libstorage/src/DmPartCo.cc
--- old/yast2-storage-2.15.12/libstorage/src/DmPartCo.cc 2007-01-09 18:20:38.000000000 +0100
+++ new/yast2-storage-2.15.13/libstorage/src/DmPartCo.cc 2007-05-23 12:45:15.000000000 +0200
@@ -1012,7 +1012,7 @@
++i;
++j;
}
- ret == ret && i==p.end() && j==pc.end();
+ ret = ret && i==p.end() && j==pc.end();
}
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/Dmraid.cc new/yast2-storage-2.15.13/libstorage/src/Dmraid.cc
--- old/yast2-storage-2.15.12/libstorage/src/Dmraid.cc 2006-09-05 17:37:09.000000000 +0200
+++ new/yast2-storage-2.15.13/libstorage/src/Dmraid.cc 2007-05-23 12:45:15.000000000 +0200
@@ -176,7 +176,7 @@
// displayed text during action, %1$s is replaced by raid partition e.g. pdc_dabaheedj1
// %2$s is replaced by size (e.g. 623.5 MB)
txt = sformat( _("Extending raid partition %1$s to %2$s"), d.c_str(), sizeString().c_str() );
-
+ txt += _(" (progress bar might not move)");
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/Evms.cc new/yast2-storage-2.15.13/libstorage/src/Evms.cc
--- old/yast2-storage-2.15.12/libstorage/src/Evms.cc 2007-02-12 16:35:20.000000000 +0100
+++ new/yast2-storage-2.15.13/libstorage/src/Evms.cc 2007-05-23 12:45:15.000000000 +0200
@@ -248,6 +248,7 @@
// %2$s is replaced by size (e.g. 623.5 MB)
txt = sformat( _("Extending EVMS volume %1$s to %2$s"), dev.c_str(), sizeString().c_str() );
+ txt += _(" (progress bar might not move)");
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/EvmsCo.cc new/yast2-storage-2.15.13/libstorage/src/EvmsCo.cc
--- old/yast2-storage-2.15.12/libstorage/src/EvmsCo.cc 2007-02-28 16:02:40.000000000 +0100
+++ new/yast2-storage-2.15.13/libstorage/src/EvmsCo.cc 2007-05-23 12:45:15.000000000 +0200
@@ -1942,7 +1942,7 @@
++i;
++j;
}
- ret == ret && i==p.end() && j==pc.end();
+ ret = ret && i==p.end() && j==pc.end();
}
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/LoopCo.cc new/yast2-storage-2.15.13/libstorage/src/LoopCo.cc
--- old/yast2-storage-2.15.12/libstorage/src/LoopCo.cc 2006-12-21 11:58:26.000000000 +0100
+++ new/yast2-storage-2.15.13/libstorage/src/LoopCo.cc 2007-05-23 12:45:15.000000000 +0200
@@ -397,7 +397,7 @@
++i;
++j;
}
- ret == ret && i==p.end() && j==pc.end();
+ ret = ret && i==p.end() && j==pc.end();
}
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/LvmLv.cc new/yast2-storage-2.15.13/libstorage/src/LvmLv.cc
--- old/yast2-storage-2.15.12/libstorage/src/LvmLv.cc 2006-08-30 16:46:09.000000000 +0200
+++ new/yast2-storage-2.15.13/libstorage/src/LvmLv.cc 2007-05-23 12:45:15.000000000 +0200
@@ -192,7 +192,7 @@
// displayed text during action, %1$s is replaced by device name e.g. /dev/system/var
// %2$s is replaced by size (e.g. 623.5 MB)
txt = sformat( _("Extending logical volume %1$s to %2$s"), dev.c_str(), sizeString().c_str() );
-
+ txt += _(" (progress bar might not move)");
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/LvmVg.cc new/yast2-storage-2.15.13/libstorage/src/LvmVg.cc
--- old/yast2-storage-2.15.12/libstorage/src/LvmVg.cc 2007-02-06 19:54:01.000000000 +0100
+++ new/yast2-storage-2.15.13/libstorage/src/LvmVg.cc 2007-05-23 12:45:15.000000000 +0200
@@ -1501,7 +1501,7 @@
++i;
++j;
}
- ret == ret && i==p.end() && j==pc.end();
+ ret = ret && i==p.end() && j==pc.end();
}
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/MdCo.cc new/yast2-storage-2.15.13/libstorage/src/MdCo.cc
--- old/yast2-storage-2.15.12/libstorage/src/MdCo.cc 2007-02-06 12:23:24.000000000 +0100
+++ new/yast2-storage-2.15.13/libstorage/src/MdCo.cc 2007-05-23 12:45:15.000000000 +0200
@@ -593,6 +593,21 @@
getStorage()->waitForDevice( m->device() );
getMdData( m->nr() );
updateEntry( m );
+ bool used_as_pv = m->getUsedByType()==UB_EVMS ||
+ m->getUsedByType()==UB_LVM;
+ y2milestone( "zeroNew:%d used_as_pv:%d",
+ getStorage()->getZeroNewPartitions(), used_as_pv );
+ if( used_as_pv || getStorage()->getZeroNewPartitions() )
+ {
+ string cmd;
+ SystemCmd c;
+ cmd = "dd if=/dev/zero of=" + m->device() + " bs=1k count=200";
+ c.execute( cmd );
+ cmd = "dd if=/dev/zero of=" + m->device() +
+ " seek=" + decString(m->sizeK()-10) +
+ " bs=1k count=10";
+ c.execute( cmd );
+ }
}
}
else
@@ -726,7 +741,7 @@
++i;
++j;
}
- ret == ret && i==p.end() && j==pc.end();
+ ret = ret && i==p.end() && j==pc.end();
}
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/Partition.cc new/yast2-storage-2.15.13/libstorage/src/Partition.cc
--- old/yast2-storage-2.15.12/libstorage/src/Partition.cc 2007-03-15 13:18:09.000000000 +0100
+++ new/yast2-storage-2.15.13/libstorage/src/Partition.cc 2007-05-23 12:45:15.000000000 +0200
@@ -508,6 +508,7 @@
// displayed text during action, %1$s is replaced by device name e.g. /dev/hda1
// %2$s is replaced by size (e.g. 623.5 MB)
txt = sformat( _("Extending partition %1$s to %2$s"), d.c_str(), sizeString().c_str() );
+ txt += _(" (progress bar might not move)");
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/PeContainer.cc new/yast2-storage-2.15.13/libstorage/src/PeContainer.cc
--- old/yast2-storage-2.15.12/libstorage/src/PeContainer.cc 2007-02-06 12:23:24.000000000 +0100
+++ new/yast2-storage-2.15.13/libstorage/src/PeContainer.cc 2007-05-23 12:45:15.000000000 +0200
@@ -729,7 +729,7 @@
CVIter j = begin();
while( ret && i!=rhs.end() && j!=end() )
ret = ret && ((Dm*)(&(*j)))->equalContent( *(Dm*)(&(*i)));
- ret == ret && i==rhs.end() && j==end();
+ ret = ret && i==rhs.end() && j==end();
}
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/Storage.cc new/yast2-storage-2.15.13/libstorage/src/Storage.cc
--- old/yast2-storage-2.15.12/libstorage/src/Storage.cc 2007-04-12 12:44:43.000000000 +0200
+++ new/yast2-storage-2.15.13/libstorage/src/Storage.cc 2007-05-23 12:45:15.000000000 +0200
@@ -2789,8 +2789,13 @@
if( vi!=p.end() )
{
const Partition* p = dynamic_cast(&(*vi));
- y2mil( "ev del :" << *ei );
- handleEvmsRemoveDevice( p->disk(), vi->device(), false );
+ y2mil( "ev del:" << *vi );
+ y2mil( "part del:" << p );
+ if( p!=NULL )
+ {
+ y2mil( "part:" << *p );
+ handleEvmsRemoveDevice( p->disk(), vi->device(), false );
+ }
}
++ei;
}
@@ -2801,10 +2806,14 @@
{
y2mil( "vi:" << *vi );
Partition* p = dynamic_cast(&(*vi));
+ y2mil( "part del:" << p );
if( p!=NULL )
+ {
+ y2mil( "part:" << *p );
handleEvmsCreateDevice( p->disk()->device(),
vi->device(),
p->type()==EXTENDED );
+ }
++vi;
}
std::map::iterator i=backups.find("initial");
@@ -4931,7 +4940,7 @@
}
void
-Storage::logCo( Container* c )
+Storage::logCo( Container* c ) const
{
std::ostringstream b;
c->print( b );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/Storage.h new/yast2-storage-2.15.13/libstorage/src/Storage.h
--- old/yast2-storage-2.15.12/libstorage/src/Storage.h 2007-03-21 20:01:21.000000000 +0100
+++ new/yast2-storage-2.15.13/libstorage/src/Storage.h 2007-05-23 12:45:15.000000000 +0200
@@ -222,7 +222,7 @@
void printInfo( std::ostream& str ) { printInfo( str, "" ); }
void printInfo( std::ostream& str, const string& name );
void printInfoCo( std::ostream& str, const string& name ) { printInfo( str, name ); }
- void logCo( Container* c );
+ void logCo( Container* c ) const;
void logCo( const string& device );
void logProcData( const string& l="" );
storage::UsedByType usedBy( const string& dev );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/libstorage/src/Volume.cc new/yast2-storage-2.15.13/libstorage/src/Volume.cc
--- old/yast2-storage-2.15.12/libstorage/src/Volume.cc 2007-05-14 11:05:18.000000000 +0200
+++ new/yast2-storage-2.15.13/libstorage/src/Volume.cc 2007-05-23 12:45:15.000000000 +0200
@@ -2458,7 +2458,7 @@
// displayed text during action, %1$s is replaced by device name e.g. /dev/hda1
// %2$s is replaced by size (e.g. 623.5 MB)
txt = sformat( _("Extending %1$s to %2$s"), d.c_str(), sizeString().c_str() );
-
+ txt += _(" (progress bar might not move)");
}
else
{
@@ -2470,7 +2470,6 @@
// displayed text before action, %1$s is replaced by device name e.g. /dev/hda1
// %2$s is replaced by size (e.g. 623.5 MB)
txt = sformat( _("Extend %1$s to %2$s"), d.c_str(), sizeString().c_str() );
-
}
return( txt );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/storage/src/inst_part_proposal.ycp new/yast2-storage-2.15.13/storage/src/inst_part_proposal.ycp
--- old/yast2-storage-2.15.12/storage/src/inst_part_proposal.ycp 2007-05-10 15:50:50.000000000 +0200
+++ new/yast2-storage-2.15.13/storage/src/inst_part_proposal.ycp 2007-05-23 13:03:11.000000000 +0200
@@ -17,7 +17,7 @@
*
*************************************************************
- $Id: inst_part_proposal.ycp 37909 2007-05-10 13:50:48Z fehr $
+ $Id: inst_part_proposal.ycp 38103 2007-05-23 11:03:11Z fehr $
*/
@@ -66,18 +66,6 @@
}
-
-
- // ///////////// DELETE THIS LINE FOR PRODUCTIOIN VERSION
- //
- // proposal_firsttime = true;
- // orig_proposal_firsttime = true;
-
-
-
-
-
-
string title = "";
string accept_str = "";
string modify_str = "";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/storage/src/modules/Storage.ycp new/yast2-storage-2.15.13/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.15.12/storage/src/modules/Storage.ycp 2007-05-10 15:50:50.000000000 +0200
+++ new/yast2-storage-2.15.13/storage/src/modules/Storage.ycp 2007-05-23 13:08:26.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 37909 2007-05-10 13:50:48Z fehr $
+ * $Id: Storage.ycp 38104 2007-05-23 11:08:25Z fehr $
*/
{
@@ -2274,12 +2274,11 @@
{
integer ret = MaxSizeLabelK(disk);
y2milestone( "MaxCylLabel val_k:%1 cyl_size:%2", ret, disk["cyl_size"]:1 );
- integer cylk = disk["cyl_size"]:1/1024;
- if( cylk<1 )
- cylk = 1;
- y2milestone( "MaxCylLabel val_k:%1 cylk:%2", ret, cylk );
- ret = ret / cylk;
- y2milestone( "MaxCylLabel ret %1", ret );
+ integer cylk2 = disk["cyl_size"]:1/512;
+ if( cylk2<2 )
+ cylk2 = 2;
+ y2milestone( "MaxCylLabel val_k:%1 cylk2:%2", ret, cylk2 );
+ ret = ret*2 / cylk2 - 1;
return( ret );
}
@@ -3330,7 +3329,7 @@
foreach( string dev, map disk, tmp,
``{
disk = getDiskInfo( dev, disk );
- integer s = disk["cyl_count"]:0 * disk["cyl_size"]:0;
+ integer s = disk["size_k"]:0 * 1024;
disk["name"] = disk["dname"]:"" +
Partitions::ByteToHumanString( s ) + ", " +
disk["device"]:"" + ", ";
@@ -5255,7 +5254,21 @@
``(p["used_by_type"]:`UB_NONE==`UB_LVM &&
p["used_by"]:""==namel)))>0) ))
{
- rdisk = (list<string>)union( rdisk, [ disk ] );
+ list<string> dl = [ disk ];
+ if( disk=="/dev/md" )
+ {
+ list<map> tl = [];
+ tl = filter( map p, data["partitions"]:[],
+ ``((p["used_by_type"]:`UB_NONE==`UB_EVMS &&
+ p["used_by"]:""==name)||
+ (p["used_by_type"]:`UB_NONE==`UB_LVM &&
+ p["used_by"]:""==namel)));
+ dl = maplist( map p, tl, ``(p["device"]:""));
+ dl = (list<string>)sort( dl );
+ dl = (list<string>)toset( dl );
+ y2milestone( "GetEvmsRealDisk dl %1", dl );
+ }
+ rdisk = (list<string>)union( rdisk, dl );
}
});
if( size(rdisk)==0 && !p["evms_native"]:false )
@@ -5285,12 +5298,16 @@
list<string> dl = GetEvmsRealDisk( tg, p );
foreach( string d, dl,
``{
+ y2milestone( "GetUsedEvmsDisks d %1", d );
if( search( d, "/dev/md" ) == 0 )
{
list<string> ndl = [];
foreach( string dd, map pp, tg,
``{
- if( pp["used_by"]:"" == substring(d,5) )
+ map pu = find( map p, pp["partitions"]:[],
+ ``(p["used_by"]:""==substring(d,5)) );
+ y2milestone( "GetUsedEvmsDisks disk:%1 used:%2", dd, pu );
+ if( pu!=nil && size(pu)>0 )
{
ndl = add( ndl, dd );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.15.12/VERSION new/yast2-storage-2.15.13/VERSION
--- old/yast2-storage-2.15.12/VERSION 2007-05-14 15:22:40.000000000 +0200
+++ new/yast2-storage-2.15.13/VERSION 2007-05-23 13:07:58.000000000 +0200
@@ -1 +1 @@
-2.15.12
+2.15.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org