Hello community,
here is the log from the commit of package yast2-storage
checked in at Wed May 10 18:45:46 CEST 2006.
--------
--- yast2-storage/yast2-storage.changes 2006-05-09 13:14:15.000000000 +0200
+++ STABLE/yast2-storage/yast2-storage.changes 2006-05-10 16:35:37.000000000 +0200
@@ -1,0 +2,11 @@
+Wed May 10 11:53:39 CEST 2006 - fehr@suse.de
+
+- allow DM device as part of sotware raids
+- fix wrong dialog handling when called in repair mode (#173446)
+- remove MD based multipathing support
+- fix bug in handling whole disks as part of EVMS container (#174294)
+- prefer non-native disks on iseries but do not completely
+ ignore native disks (#166378)
+- version 2.13.62
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.13.61.tar.bz2
New:
----
yast2-storage-2.13.62.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.qavVGZ/_old 2006-05-10 18:45:29.000000000 +0200
+++ /var/tmp/diff_new_pack.qavVGZ/_new 2006-05-10 18:45:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.13.61)
+# spec file for package yast2-storage (Version 2.13.62)
#
# Copyright (c) 2006 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.13.61
+Version: 2.13.62
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.13.61.tar.bz2
+Source0: yast2-storage-2.13.62.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-devtools yast2-installation yast2-perl-bindings yast2-testsuite
Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings
@@ -40,7 +40,7 @@
%prep
-%setup -n yast2-storage-2.13.61
+%setup -n yast2-storage-2.13.62
%build
%{prefix}/bin/y2tool y2autoconf
@@ -164,6 +164,14 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%changelog -n yast2-storage
+* Wed May 10 2006 - fehr@suse.de
+- allow DM device as part of sotware raids
+- fix wrong dialog handling when called in repair mode (#173446)
+- remove MD based multipathing support
+- fix bug in handling whole disks as part of EVMS container (#174294)
+- prefer non-native disks on iseries but do not completely
+ ignore native disks (#166378)
+- version 2.13.62
* Tue May 09 2006 - fehr@suse.de
- additional fixes for generic dm devices
- version 2.13.61
++++++ yast2-storage-2.13.61.tar.bz2 -> yast2-storage-2.13.62.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/VERSION new/yast2-storage-2.13.62/VERSION
--- old/yast2-storage-2.13.61/VERSION 2006-05-09 13:14:19.000000000 +0200
+++ new/yast2-storage-2.13.62/VERSION 2006-05-10 11:53:48.000000000 +0200
@@ -1 +1 @@
-2.13.61
+2.13.62
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/libstorage/src/Dm.cc new/yast2-storage-2.13.62/libstorage/src/Dm.cc
--- old/yast2-storage-2.13.61/libstorage/src/Dm.cc 2006-05-09 12:49:47.000000000 +0200
+++ new/yast2-storage-2.13.62/libstorage/src/Dm.cc 2006-05-09 16:07:26.000000000 +0200
@@ -176,9 +176,11 @@
if( pos != string::npos )
pair[pos] = ' ';
pair >> mj;
- if( mj==dm_major )
+ list<string> ls = splitString(pair);
+ if( mj==dm_major && ls.size()>=2 )
{
- c.execute( "devmap_name " + pair );
+ c.execute( "dmsetup info -c --noheadings -j " + *ls.begin() +
+ " -m " + *(++ls.begin()) + " | sed -e \"s/:.*//\"" );
if( c.retcode()==0 && c.numLines()>0 )
{
string tmp = "/dev/"+*c.getLine(0);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/libstorage/src/DmCo.cc new/yast2-storage-2.13.62/libstorage/src/DmCo.cc
--- old/yast2-storage-2.13.61/libstorage/src/DmCo.cc 2006-05-09 12:51:43.000000000 +0200
+++ new/yast2-storage-2.13.62/libstorage/src/DmCo.cc 2006-05-09 17:36:04.000000000 +0200
@@ -124,11 +124,15 @@
if( !in_use || multipath )
getStorage()->setUsedBy( it->first, UB_DM, table );
}
- y2mil( "in_use:" << in_use << " multipath:" << multipath );
- if( !in_use || multipath )
+ string tmp = m->device();
+ tmp.erase( 5, 7 );
+ bool known = getStorage()->knownDevice( tmp, true );
+ y2mil( "in_use:" << in_use << " multipath:" << multipath <<
+ " known " << tmp << " is:" << known );
+ if( !known && m->sizeK()>0 )
addDm( m );
else
- delete m;
+ delete( m );
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/libstorage/src/EvmsAccess.cc new/yast2-storage-2.13.62/libstorage/src/EvmsAccess.cc
--- old/yast2-storage-2.13.61/libstorage/src/EvmsAccess.cc 2006-04-26 13:39:02.000000000 +0200
+++ new/yast2-storage-2.13.62/libstorage/src/EvmsAccess.cc 2006-05-10 15:56:56.000000000 +0200
@@ -1024,22 +1024,29 @@
if( ret!=0 )
{
std::list::const_iterator i=objects.begin();
- while( i!=objects.end() && (*i)->type()!=EVMS_DISK &&
- (*i)->name()!=dev )
+ while( i!=objects.end() &&
+ ((*i)->type()!=EVMS_DISK || (*i)->name()!=dev) )
+ {
+ y2mil( "*i type:" << (*i)->type() << " name:" << (*i)->name() );
++i;
+ }
if( i!=objects.end() )
{
y2mil( "dev:" << dev << " id:" << (*i)->id() );
ret = evms_unassign( (*i)->id() );
y2milestone( "ret %d evms_unassign id %d", ret, (*i)->id() );
input->handle[count] = (*i)->id();
+ ret = 0;
}
- if( ret!=0 )
+ else
{
i=objects.begin();
- while( i!=objects.end() && (*i)->type()!=EVMS_VOLUME &&
- (*i)->name()!=dev )
+ while( i!=objects.end() &&
+ ((*i)->type()!=EVMS_VOLUME || (*i)->name()!=dev) )
+ {
+ y2mil( "*i type:" << (*i)->type() << " name:" << (*i)->name() );
++i;
+ }
if( i!=objects.end() )
{
ret = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/libstorage/src/Storage.cc new/yast2-storage-2.13.62/libstorage/src/Storage.cc
--- old/yast2-storage-2.13.61/libstorage/src/Storage.cc 2006-05-09 12:21:08.000000000 +0200
+++ new/yast2-storage-2.13.62/libstorage/src/Storage.cc 2006-05-10 16:02:28.000000000 +0200
@@ -3273,10 +3273,12 @@
if( dm->mapsTo( dev ) )
{
dm->removeTable();
+ dm->setSilent();
+ dm->setDeleted();
ret = true;
}
}
- else
+ else if( dm==NULL )
y2warning( "not a Dm descendant %s", v->device().c_str() );
}
y2milestone( "ret:%d", ret );
@@ -3985,9 +3987,7 @@
DiskIterator i = findDisk( dev );
if( i != dEnd() )
{
- y2mil( "disk before" << *i << endl );
i->setUsedBy( typ, name );
- y2mil( "disk after" << *i << endl );
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.13.62/storage/src/include/do_proposal_flexible.ycp
--- old/yast2-storage-2.13.61/storage/src/include/do_proposal_flexible.ycp 2006-04-19 12:18:23.000000000 +0200
+++ new/yast2-storage-2.13.62/storage/src/include/do_proposal_flexible.ycp 2006-05-10 16:35:56.000000000 +0200
@@ -14,7 +14,7 @@
*
*************************************************************
- $Id: do_proposal_flexible.ycp 30229 2006-04-19 10:18:18Z fehr $
+ $Id: do_proposal_flexible.ycp 30828 2006-05-10 14:35:54Z fehr $
*/
{
@@ -54,7 +54,7 @@
{
ret = true;
}
- if( !ret && Arch::board_iseries () && search( dev, "/dev/sd" )==0 )
+ if( !ret && soft && Arch::board_iseries () && search( dev, "/dev/sd" )==0 )
{
ret = true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/storage/src/include/evms_lib.ycp new/yast2-storage-2.13.62/storage/src/include/evms_lib.ycp
--- old/yast2-storage-2.13.61/storage/src/include/evms_lib.ycp 2006-04-26 15:12:48.000000000 +0200
+++ new/yast2-storage-2.13.62/storage/src/include/evms_lib.ycp 2006-05-10 16:25:33.000000000 +0200
@@ -11,7 +11,7 @@
* Thomas Fehr
*
*
- * $Id: evms_lib.ycp 30495 2006-04-26 13:12:34Z fehr $
+ * $Id: evms_lib.ycp 30824 2006-05-10 14:25:29Z fehr $
*
*/
@@ -153,6 +153,20 @@
return( ret );
}
+define list<map> filter_used_disk_evms_part( map tg, list<map> pa, string name )
+ {
+ boolean ok = false;
+ list<map> ret = filter( map p, pa,
+ ``{
+ string dev = evms_dev_disk( p["device"]:"" );
+ ok = tg[dev,"used_by_type"]:`UB_NONE == `UB_NONE ||
+ (tg[dev,"used_by_type"]:`UB_NONE == `UB_EVMS &&
+ tg[dev,"used_by"]:"" == name);
+ return( ok );
+ });
+ return( ret );
+ }
+
define list<map> get_pvlist( map tg, string name )
``{
list<map> pv = [];
@@ -169,6 +183,7 @@
p["used_by"]:""==name)));
tmp = filter( map p, tmp, ``(size(p["mount"]:"")==0));
tmp = filter_mounted_evms_part( tg, tmp );
+ tmp = filter_used_disk_evms_part( tg, tmp, name );
y2milestone( "key %1 tmp %2", k, tmp );
pv = (list<map>)merge( pv, tmp );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/storage/src/include/raid_lib.ycp new/yast2-storage-2.13.62/storage/src/include/raid_lib.ycp
--- old/yast2-storage-2.13.61/storage/src/include/raid_lib.ycp 2006-04-03 18:28:11.000000000 +0200
+++ new/yast2-storage-2.13.62/storage/src/include/raid_lib.ycp 2006-05-10 12:01:05.000000000 +0200
@@ -10,7 +10,7 @@
* Authors:
* mike
*
- * $Id: raid_lib.ycp 24121 2005-07-18 13:33:35Z fehr $
+ * $Id: raid_lib.ycp 30804 2006-05-10 10:01:01Z fehr $
*
*
*----------------------
@@ -106,11 +106,6 @@
targetMap = mapmap( string dev, map devmap, targetMap,
``{
- boolean is_lvm_vg = devmap["type"]:`CT_UNKNOWN==`CT_LVM;
- boolean is_evms = devmap["type"]:`CT_UNKNOWN==`CT_EVMS;
- boolean is_raid = devmap["type"]:`CT_UNKNOWN==`CT_MD;
- integer cyl_size = devmap["cyl_size"]:1000000;
-
list<map> partitions =
maplist( map part, devmap["partitions"]:[],
``{
@@ -131,7 +126,7 @@
// no RAID devices (this is for experts only, by hand)
list<map> allret = [];
- list types_no = [ `lvm, `sw_raid, `evms, `dm ];
+ list types_no = [ `lvm, `sw_raid, `evms ];
list fsids = [ Partitions::fsid_lvm, Partitions::fsid_raid,
Partitions::fsid_native ];
list ubs = [ `UB_NONE, `UB_MD ];
@@ -141,7 +136,7 @@
``( size(p["mount"]:"")==0 &&
!contains( types_no, p["type"]:`primary ) &&
contains( ubs, p["used_by_type"]:`UB_NONE ) &&
- contains( fsids, p["fsid"]:0 )));
+ (!haskey(p,"fsid")||contains( fsids, p["fsid"]:0 ))));
allret = (list<map>)merge(allret, ret );
});
return( allret );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/storage/src/include/raid_ui.ycp new/yast2-storage-2.13.62/storage/src/include/raid_ui.ycp
--- old/yast2-storage-2.13.61/storage/src/include/raid_ui.ycp 2006-05-08 17:34:04.000000000 +0200
+++ new/yast2-storage-2.13.62/storage/src/include/raid_ui.ycp 2006-05-10 12:40:21.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Michael Hager
*
- * $Id: raid_ui.ycp 24398 2005-07-28 08:59:02Z fehr $
+ * $Id: raid_ui.ycp 30806 2006-05-10 10:40:18Z fehr $
*
* All user interface functions for RAID.
*
@@ -152,11 +152,13 @@
raid=="raid1")),
`VSpacing (1),
`Left(`RadioButton(`id("raid5"), r5_text,
- raid=="raid5")),
+ raid=="raid5"))
+/*
`VSpacing (1),
`Left(`RadioButton(`id("multipath"), mp_text,
raid=="multipath")),
- MpDetect
+ MpDetect
+*/
)
)
),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/storage/src/inst_custom_part.ycp new/yast2-storage-2.13.62/storage/src/inst_custom_part.ycp
--- old/yast2-storage-2.13.61/storage/src/inst_custom_part.ycp 2006-05-09 13:14:45.000000000 +0200
+++ new/yast2-storage-2.13.62/storage/src/inst_custom_part.ycp 2006-05-10 12:01:05.000000000 +0200
@@ -26,7 +26,7 @@
*
*************************************************************
- $Id: inst_custom_part.ycp 30753 2006-05-09 11:14:38Z fehr $
+ $Id: inst_custom_part.ycp 30804 2006-05-10 10:01:01Z fehr $
*/
{
@@ -99,7 +99,10 @@
boolean button_adapt_mp = false; // Should the "Adapt mount points from
// existing /etc/fstab" -Button be shown in Expert menu
- y2milestone( "EVMS:%1", ProductFeatures::GetBooleanFeature ("partitioning", "evms_config") );
+ if( button_evms && Mode::normal() &&
+ SCR::Read( .target.size, "/usr/share/YaST2/clients/inst_evms.ycp" )<=0 )
+ button_evms = false;
+ y2milestone( "EVMS:%1", button_evms );
boolean test_mode = Mode::test ();
string boot_mode = "fritz";
/* FIXME string boot_mode = Bootloader::getLoaderType ();*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/storage/src/inst_disk.ycp new/yast2-storage-2.13.62/storage/src/inst_disk.ycp
--- old/yast2-storage-2.13.61/storage/src/inst_disk.ycp 2006-04-03 18:28:08.000000000 +0200
+++ new/yast2-storage-2.13.62/storage/src/inst_disk.ycp 2006-05-10 12:01:47.000000000 +0200
@@ -12,7 +12,7 @@
* Authors:
* Michael Hager
*
- * $Id: inst_disk.ycp 27261 2006-01-23 18:36:33Z fehr $
+ * $Id: inst_disk.ycp 30805 2006-05-10 10:01:45Z fehr $
*
* Main file for disk configuration. Uses all other files.
*
@@ -187,8 +187,10 @@
`cancel : `cancel]
];
+ boolean handle_dialog = Mode::normal() || Mode::repair();
- if ( Mode::normal () ) {
+
+ if ( handle_dialog ) {
Wizard::CreateDialog();
Wizard::SetDesktopIcon("disk");
StorageClients::EnablePopup();
@@ -199,10 +201,10 @@
/*************************************************/
symbol ret = Sequencer::Run(aliases, sequence);
/*************************************************/
- y2milestone( "Sequencer ret=%1 Mode::normal ()=%2", ret, Mode::normal () );
+ y2milestone( "Sequencer ret=%1 handle_dialog=%2", ret, handle_dialog );
- if( Mode::normal () )
+ if( handle_dialog )
{
UI::CloseDialog();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.61/storage/src/modules/Storage.ycp new/yast2-storage-2.13.62/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.13.61/storage/src/modules/Storage.ycp 2006-05-09 13:14:45.000000000 +0200
+++ new/yast2-storage-2.13.62/storage/src/modules/Storage.ycp 2006-05-10 12:01:05.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 30753 2006-05-09 11:14:38Z fehr $
+ * $Id: Storage.ycp 30804 2006-05-10 10:01:01Z fehr $
*/
{
@@ -3578,6 +3578,7 @@
if( need_evms )
{
pl = add( pl, "evms" );
+ pl = add( pl, "yast2-storage-evms" );
}
y2milestone( "AddPackageList ret %1", pl );
return( pl );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...