Hello community,
here is the log from the commit of package yast2-storage
checked in at Tue May 9 00:56:19 CEST 2006.
--------
--- yast2-storage/yast2-storage.changes 2006-05-05 14:55:51.000000000 +0200
+++ STABLE/yast2-storage/yast2-storage.changes 2006-05-08 18:13:42.000000000 +0200
@@ -1,0 +2,8 @@
+Mon May 8 16:12:55 CEST 2006 - fehr(a)suse.de
+
+- fix wrong warning text on deletion of extended partition (#173406)
+- add edd module to INITRD_MODULES if it is loaded
+- improve support for generic dm devices
+- version 2.13.60
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.13.59.tar.bz2
New:
----
yast2-storage-2.13.60.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.6NcokA/_old 2006-05-09 00:55:43.000000000 +0200
+++ /var/tmp/diff_new_pack.6NcokA/_new 2006-05-09 00:55:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.13.59)
+# spec file for package yast2-storage (Version 2.13.60)
#
# 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.59
+Version: 2.13.60
Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.13.59.tar.bz2
+Source0: yast2-storage-2.13.60.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.59
+%setup -n yast2-storage-2.13.60
%build
%{prefix}/bin/y2tool y2autoconf
@@ -164,6 +164,11 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%changelog -n yast2-storage
+* Mon May 08 2006 - fehr(a)suse.de
+- fix wrong warning text on deletion of extended partition (#173406)
+- add edd module to INITRD_MODULES if it is loaded
+- improve support for generic dm devices
+- version 2.13.60
* Fri May 05 2006 - fehr(a)suse.de
- patch proofread texts back into ycp
- zero last 32k of volume to be formatted (#164867)
++++++ yast2-storage-2.13.59.tar.bz2 -> yast2-storage-2.13.60.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.59/VERSION new/yast2-storage-2.13.60/VERSION
--- old/yast2-storage-2.13.59/VERSION 2006-05-04 12:25:37.000000000 +0200
+++ new/yast2-storage-2.13.60/VERSION 2006-05-08 16:13:27.000000000 +0200
@@ -1 +1 @@
-2.13.59
+2.13.60
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.59/libstorage/src/Dm.cc new/yast2-storage-2.13.60/libstorage/src/Dm.cc
--- old/yast2-storage-2.13.59/libstorage/src/Dm.cc 2006-05-02 19:14:53.000000000 +0200
+++ new/yast2-storage-2.13.60/libstorage/src/Dm.cc 2006-05-08 18:21:42.000000000 +0200
@@ -32,7 +32,6 @@
stripe = 1;
stripe_size = 0;
inactiv = true;
- dev = "/dev/dm-" + decString(mnum);
nm = tn;
init();
getTableInfo();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.59/libstorage/src/DmCo.cc new/yast2-storage-2.13.60/libstorage/src/DmCo.cc
--- old/yast2-storage-2.13.59/libstorage/src/DmCo.cc 2006-04-27 17:12:48.000000000 +0200
+++ new/yast2-storage-2.13.60/libstorage/src/DmCo.cc 2006-05-08 18:27:39.000000000 +0200
@@ -40,7 +40,7 @@
DmCo::init()
{
nm = "dm";
- dev = "/dev/dm-";
+ dev = "/dev/mapper";
}
void
@@ -80,8 +80,10 @@
minor >> min_num;
Dm * m = new Dm( *this, table, min_num );
unsigned long long s = 0;
- if( ppart.getSize( m->device(), s ))
+ string dev = "/dev/dm-" + decString(min_num);
+ if( ppart.getSize( dev, s ))
{
+ y2mil( "new dm size:" << s );
m->setSize( s );
}
bool in_use = false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.59/storage/src/include/custom_part_check_generated.ycp new/yast2-storage-2.13.60/storage/src/include/custom_part_check_generated.ycp
--- old/yast2-storage-2.13.59/storage/src/include/custom_part_check_generated.ycp 2006-05-03 08:49:49.000000000 +0200
+++ new/yast2-storage-2.13.60/storage/src/include/custom_part_check_generated.ycp 2006-05-08 16:19:52.000000000 +0200
@@ -24,7 +24,7 @@
*
*************************************************************
- $Id: custom_part_check_generated.ycp 30634 2006-05-03 06:49:44Z fehr $
+ $Id: custom_part_check_generated.ycp 30732 2006-05-08 14:19:48Z fehr $
*/
{
@@ -896,8 +896,10 @@
if( !installation )
{
list<map> mounts = Storage::mountedPartitionsOnDisk( del_dev );
+ y2milestone( "check_extended_delete mounts:%1", mounts );
mounts = filter( map mount, mounts,
``( contains( logical_parts_names, mount["device"]:"")));
+ y2milestone( "check_extended_delete mounts:%1", mounts );
if( size( mounts ) != 0 )
{
/////////////////////////////////////////////////////////////////////////////////////////
@@ -908,8 +910,8 @@
// %1 is replaced by device name, %1 by directory e.g /dev/hdd1 on /usr
mounted_parts = mounted_parts +
- sformat( "%1 on %2", mount["spec"]:"",
- mount["file"]:"") + "\n";
+ sformat( "%1 --> %2", mount["device"]:"",
+ mount["mount"]:"") + "\n";
});
// popup text
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.59/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.13.60/storage/src/include/custom_part_dialogs.ycp
--- old/yast2-storage-2.13.59/storage/src/include/custom_part_dialogs.ycp 2006-05-04 12:25:56.000000000 +0200
+++ new/yast2-storage-2.13.60/storage/src/include/custom_part_dialogs.ycp 2006-05-08 18:39:00.000000000 +0200
@@ -16,7 +16,7 @@
*
*************************************************************
- $Id: custom_part_dialogs.ycp 30675 2006-05-04 10:25:52Z fehr $
+ $Id: custom_part_dialogs.ycp 30739 2006-05-08 16:38:56Z fehr $
*/
{
@@ -921,7 +921,7 @@
* @return term the term contains two TextEntries or to Labels with the start and the end cylinder of
* the partition in new_val
*/
-define term SizeDlg( map new_val, integer cyl_size, boolean edit_size )
+define term SizeDlg( map new_val, integer cyl_size, boolean edit_size, boolean disk )
``{
string start_cyl = sformat( "%1", new_val["region",0]:0 );
string end_part = sformat( "%1", (integer)(new_val["region",0]:0) +
@@ -947,7 +947,7 @@
)
);
}
- else
+ else if( disk )
{
return (
`HBox(
@@ -962,6 +962,8 @@
+ "\n " + end_part ))
));
}
+ else
+ return( `Empty() );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.59/storage/src/inst_custom_part.ycp new/yast2-storage-2.13.60/storage/src/inst_custom_part.ycp
--- old/yast2-storage-2.13.59/storage/src/inst_custom_part.ycp 2006-05-03 15:05:59.000000000 +0200
+++ new/yast2-storage-2.13.60/storage/src/inst_custom_part.ycp 2006-05-08 18:39:00.000000000 +0200
@@ -26,7 +26,7 @@
*
*************************************************************
- $Id: inst_custom_part.ycp 30649 2006-05-03 13:05:55Z fehr $
+ $Id: inst_custom_part.ycp 30739 2006-05-08 16:38:56Z fehr $
*/
{
@@ -1319,7 +1319,10 @@
``{
boolean create = cur_val["create"]:false;
string dev = cur_val["device"]:"";
+ boolean is_disk = cur_val["type"]:`primary == `primary ||
+ cur_val["type"]:`primary == `logical;
y2milestone( "EditOrCreatePartDlg cur_val:%1", cur_val );
+ y2milestone( "EditOrCreatePartDlg is_disk:%1", is_disk );
string helptextCR = getEditOrCreateHelptext( cur_val, !create );
@@ -1331,7 +1334,7 @@
// right side of the main dialog
term field_dlg_right =
`VBox(
- `Top( SizeDlg( cur_val, cyl_size, edit_size )),
+ `Top( SizeDlg( cur_val, cyl_size, edit_size, is_disk )),
`VSpacing(1),
`ReplacePoint( `id(`mount_dlg_rp), MountDlg( cur_val, [] ))
);
@@ -1453,7 +1456,11 @@
retval["region"] = region;
}
- if( !check_ok_fssize( retval["region",1]:0 * cyl_size, retval ))
+ integer check_size = retval["size_k"]:0 * 1024;
+ if( is_disk )
+ check_size = retval["region",1]:0 * cyl_size;
+
+ if( !check_ok_fssize( check_size, retval ))
{
UI::SetFocus(`id(`end_part));
ret = `again;
@@ -2026,7 +2033,7 @@
`HWeight(50,`RichText( helptextCR )),
/// right side
// popup create partition: frame description Start/End Cylinder
- `HWeight( 40, SizeDlg( new_val, cyl_size, true) )
+ `HWeight( 40, SizeDlg( new_val, cyl_size, true, true) )
),
`VSpacing(0.5),
`HBox(
@@ -2969,6 +2976,10 @@
// header of the dialog to edit a partition %1 is replaced by device name (e.g. /dev/hda1)
title = sformat( _("Edit Existing Partition %1"),
part["device"]:"" );
+ if( part["type"]:`primary != `primary &&
+ part["type"]:`primary != `logical )
+ title = sformat( _("Edit Existing Device %1"),
+ part["device"]:"" );
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.59/storage/src/modules/Storage.ycp new/yast2-storage-2.13.60/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.13.59/storage/src/modules/Storage.ycp 2006-04-24 17:46:31.000000000 +0200
+++ new/yast2-storage-2.13.60/storage/src/modules/Storage.ycp 2006-05-08 17:29:16.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 30423 2006-04-24 15:46:27Z fehr $
+ * $Id: Storage.ycp 30733 2006-05-08 15:29:13Z fehr $
*/
{
@@ -4765,6 +4765,11 @@
initrdmodules = merge( initrdmodules, dl );
initrdmodules = add( initrdmodules, "usb_storage" );
}
+ SCR::UnmountAgent (.proc.modules);
+ map lmod = (map) SCR::Read(.proc.modules);
+ y2milestone( "GetRootInitrdModules lmod:%1", lmod );
+ if( size(lmod["edd"]:$[])>0 )
+ initrdmodules = add( initrdmodules, "edd" );
y2milestone( "GetRootInitrdModules ret %1", initrdmodules );
return initrdmodules;
};
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
