Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu Oct 12 22:14:11 CEST 2006.
--------
--- yast2-storage/yast2-storage.changes 2006-10-10 12:51:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2006-10-12 18:31:49.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Oct 12 15:05:56 CEST 2006 - fehr@suse.de
+
+- fix evms volume initialisation if LVM VGs are present
+- activate EVMS volumes before creating EVMS proposal
+- fixed problems handling swap in EVMS and conflicts check
+- version 2.14.10
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.14.9.tar.bz2
New:
----
yast2-storage-2.14.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.9RCf4t/_old 2006-10-12 22:13:49.000000000 +0200
+++ /var/tmp/diff_new_pack.9RCf4t/_new 2006-10-12 22:13:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.14.9)
+# spec file for package yast2-storage (Version 2.14.10)
#
# 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.14.9
+Version: 2.14.10
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.14.9.tar.bz2
+Source0: yast2-storage-2.14.10.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
Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings
@@ -40,7 +40,7 @@
%prep
-%setup -n yast2-storage-2.14.9
+%setup -n yast2-storage-2.14.10
%build
%{prefix}/bin/y2tool y2autoconf
@@ -165,6 +165,11 @@
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog -n yast2-storage
+* Thu Oct 12 2006 - fehr@suse.de
+- fix evms volume initialisation if LVM VGs are present
+- activate EVMS volumes before creating EVMS proposal
+- fixed problems handling swap in EVMS and conflicts check
+- version 2.14.10
* Tue Oct 10 2006 - fehr@suse.de
- add changes to use new "driver_module" by hwinfo (#211225)
- change default fs to ext3 (feature #301235)
++++++ yast2-storage-2.14.9.tar.bz2 -> yast2-storage-2.14.10.tar.bz2 ++++++
++++ 6615 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.14.9/VERSION new/yast2-storage-2.14.10/VERSION
--- old/yast2-storage-2.14.9/VERSION 2006-10-10 12:51:45.000000000 +0200
+++ new/yast2-storage-2.14.10/VERSION 2006-10-12 18:31:39.000000000 +0200
@@ -1 +1 @@
-2.14.9
+2.14.10
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.14.9/configure.in new/yast2-storage-2.14.10/configure.in
--- old/yast2-storage-2.14.9/configure.in 2006-07-13 13:44:08.000000000 +0200
+++ new/yast2-storage-2.14.10/configure.in 2006-10-12 12:30:30.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.14.0, http://www.suse.de/feedback, yast2-storage)
+AC_INIT(yast2-storage, 2.14.9, http://www.suse.de/feedback, 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.14.0"
+VERSION="2.14.9"
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.14.9/libstorage/src/Storage.cc new/yast2-storage-2.14.10/libstorage/src/Storage.cc
--- old/yast2-storage-2.14.9/libstorage/src/Storage.cc 2006-10-10 12:49:50.000000000 +0200
+++ new/yast2-storage-2.14.10/libstorage/src/Storage.cc 2006-10-12 16:54:56.000000000 +0200
@@ -2623,6 +2623,11 @@
return( ret );
}
+static bool isEvms( const Volume& v )
+ {
+ return( v.cType()==EVMS );
+ }
+
int Storage::evmsActivate()
{
int ret = 0;
@@ -2643,6 +2648,8 @@
if( ret==0 )
{
detectEvms();
+ VPair p = vPair( isEvms );
+ detectFsData( p.begin(), p.end() );
}
}
}
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.14.9/storage/src/include/custom_part_helptexts.ycp new/yast2-storage-2.14.10/storage/src/include/custom_part_helptexts.ycp
--- old/yast2-storage-2.14.9/storage/src/include/custom_part_helptexts.ycp 2006-09-19 19:42:17.000000000 +0200
+++ new/yast2-storage-2.14.10/storage/src/include/custom_part_helptexts.ycp 2006-10-12 12:47:03.000000000 +0200
@@ -20,7 +20,7 @@
*
*************************************************************
- $Id: custom_part_helptexts.ycp 32991 2006-09-19 17:43:52Z fehr $
+ $Id: custom_part_helptexts.ycp 33346 2006-10-12 10:47:02Z fehr $
*/
@@ -311,7 +311,7 @@
// helptext expert partitioning. 19
help_text = help_text + _("<p>
<b>Used By</b> tells if a device is used by LVM, RAID or EVMS. If you do not use such
-things, it is perfectly normal for this columen to be empty.
+things, it is perfectly normal for this column to be empty.
</p>
");
// helptext expert partitioning. 20
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.14.9/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.14.10/storage/src/include/do_proposal_flexible.ycp
--- old/yast2-storage-2.14.9/storage/src/include/do_proposal_flexible.ycp 2006-09-26 19:06:38.000000000 +0200
+++ new/yast2-storage-2.14.10/storage/src/include/do_proposal_flexible.ycp 2006-10-12 15:30:02.000000000 +0200
@@ -14,7 +14,7 @@
*
*************************************************************
- $Id: do_proposal_flexible.ycp 33142 2006-09-26 17:06:33Z fehr $
+ $Id: do_proposal_flexible.ycp 33354 2006-10-12 13:30:00Z fehr $
*/
{
@@ -3691,7 +3691,15 @@
if( size(vg)==0 )
ret = get_inst_proposal( target );
else
+ {
+ if( Storage::ProposalEvms() &&
+ size(target["/dev/evms","partitions"]:[])==0 )
+ {
+ Storage::ActivateEvms();
+ target = Storage::GetTargetMap();
+ }
ret = get_inst_prop_vm( target, vg );
+ }
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.14.9/storage/src/include/evms_lib.ycp new/yast2-storage-2.14.10/storage/src/include/evms_lib.ycp
--- old/yast2-storage-2.14.9/storage/src/include/evms_lib.ycp 2006-09-20 12:26:33.000000000 +0200
+++ new/yast2-storage-2.14.10/storage/src/include/evms_lib.ycp 2006-10-12 16:55:21.000000000 +0200
@@ -11,7 +11,7 @@
* Thomas Fehr
*
*
- * $Id: evms_lib.ycp 33002 2006-09-20 10:28:09Z fehr $
+ * $Id: evms_lib.ycp 33366 2006-10-12 14:55:19Z fehr $
*
*/
@@ -1148,7 +1148,7 @@
if( size(retval["mount"]:"")>0 && Storage::DoCheckEvmsNonEvms )
{
map tg = Storage::GetTargetMap();
- list<string> ud = Storage::GetUsedRealDisks( tg );
+ list<string> ud = Storage::GetUsedRealDisksNew( tg, true );
list<string> dl = Storage::GetEvmsRealDisk( tg, part );
list isc = filter( string d, dl, ``(contains( ud, d )));
if( size(isc)>0 )
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.14.9/storage/src/include/raid_ui.ycp new/yast2-storage-2.14.10/storage/src/include/raid_ui.ycp
--- old/yast2-storage-2.14.9/storage/src/include/raid_ui.ycp 2006-09-20 12:26:33.000000000 +0200
+++ new/yast2-storage-2.14.10/storage/src/include/raid_ui.ycp 2006-10-12 12:47:03.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Michael Hager
*
- * $Id: raid_ui.ycp 33002 2006-09-20 10:28:09Z fehr $
+ * $Id: raid_ui.ycp 33346 2006-10-12 10:47:02Z fehr $
*
* All user interface functions for RAID.
*
@@ -73,7 +73,7 @@
define string ChooseRaidTypeHelp()
``{
// help text
- string help = _("<p><b>RAID 0:</b> This level increases your disk performace.
+ string help = _("<p><b>RAID 0:</b> This level increases your disk performance.
There is <b>NO</b> redundancy in this mode. If one of the drives crashes, data recovery will not be possible.</p>
");
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.14.9/storage/src/inst_evms.ycp new/yast2-storage-2.14.10/storage/src/inst_evms.ycp
--- old/yast2-storage-2.14.9/storage/src/inst_evms.ycp 2006-04-03 18:28:15.000000000 +0200
+++ new/yast2-storage-2.14.10/storage/src/inst_evms.ycp 2006-10-12 18:13:33.000000000 +0200
@@ -12,7 +12,7 @@
*
*
*
- * $Id: inst_evms.ycp 26548 2005-12-15 16:37:09Z fehr $
+ * $Id: inst_evms.ycp 33372 2006-10-12 16:13:30Z fehr $
*
*/
@@ -34,14 +34,15 @@
map targetMap = Storage::GetTargetMap();
string no_container = "-none-";
+ boolean changed = false;
+
+ Storage::CreateTargetBackup("evms");
y2milestone( "evms:%1", targetMap["/dev/evms","partitions"]:[] );
y2milestone( "evms co:%1", size(filter(string k, map e, targetMap,
``(e["is_container"]:false))));
- if( size(targetMap["/dev/evms","partitions"]:[])==0 &&
- size(filter(string k, map e, targetMap,
- ``(e["is_container"]:false)))==0)
+ if( size(targetMap["/dev/evms","partitions"]:[])==0 )
{
Storage::ActivateEvms();
targetMap = Storage::GetTargetMap();
@@ -49,6 +50,43 @@
y2milestone( "evms co:%1", size(filter(string k, map e, targetMap,
``(e["is_container"]:false))));
}
+ foreach( string k, map e, targetMap,
+ ``{
+ if( e["type"]:`CT_UNKNOWN==`CT_LVM &&
+ find( map p, e["partitions"]:[], ``(p["mount"]:""=="swap"))!=nil )
+ {
+ changed = true;
+ y2milestone( "k %1", k );
+ targetMap[k,"partitions"] =
+ maplist( map p, e["partitions"]:[],
+ ``{
+ if( p["mount"]:""=="swap" )
+ p["mount"] = "";
+ return( p );
+ });
+ y2milestone( "k part %1", targetMap[k,"partitions"]:[] );
+ }
+ });
+ foreach( string k, map e, targetMap,
+ ``{
+ if( changed && e["type"]:`CT_UNKNOWN==`CT_EVMS &&
+ e["is_container"]:false )
+ {
+ y2milestone( "k %1", k );
+ targetMap[k,"partitions"] =
+ maplist( map p, e["partitions"]:[],
+ ``{
+ if( Stage::initial() && p["detected_fs"]:`unknown==`swap )
+ {
+ p["mount"] = "swap";
+ }
+ return( p );
+ });
+ y2milestone( "k part %1", targetMap[k,"partitions"]:[] );
+ }
+ });
+ if( changed )
+ Storage::SetTargetMap( targetMap );
list evms_cont = get_containers( targetMap, no_container );
list table = [];
@@ -148,8 +186,7 @@
string id = "";
symbol ret = `next;
- boolean changed = false;
- Storage::CreateTargetBackup("evms");
+ changed = false;
repeat
{
/////////////////////////////////////////////////////////////////
@@ -303,9 +340,10 @@
}
}
}
-
}
until (ret == `next || ret == `back || ret == `cancel || ret == `abort );
+ if( !changed )
+ Storage::RestoreTargetBackup("evms");
Storage::DisposeTargetBackup("evms");
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.14.9/storage/src/modules/FileSystems.ycp new/yast2-storage-2.14.10/storage/src/modules/FileSystems.ycp
--- old/yast2-storage-2.14.9/storage/src/modules/FileSystems.ycp 2006-09-26 18:17:47.000000000 +0200
+++ new/yast2-storage-2.14.10/storage/src/modules/FileSystems.ycp 2006-10-12 12:47:03.000000000 +0200
@@ -7,7 +7,7 @@
* These module contains the supported filesystems and their settings.
*
*
- * $Id: FileSystems.ycp 33141 2006-09-26 16:17:44Z fehr $
+ * $Id: FileSystems.ycp 33346 2006-10-12 10:47:02Z fehr $
*/
{
module "FileSystems";
@@ -330,7 +330,7 @@
// help text, richtext format
`help_text : _("<p><b>Arbitrary Option Value:</b>
In this field, type any legal mount option allowed in the fourth field of /etc/fstab.
-Mutiple options are separated by commas.</p>
+Multiple options are separated by commas.</p>
"),
`type : `text
];
@@ -596,7 +596,7 @@
`type : `boolean,
`default : false,
// help text, richtext format
- `help_text : _("<p><b>Directoy Index:</b>
+ `help_text : _("<p><b>Directory Index:</b>
Enables use of hashed b-trees to speed up lookups in large directories.</p>\n")
]
];
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.14.9/storage/src/modules/Storage.ycp new/yast2-storage-2.14.10/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.14.9/storage/src/modules/Storage.ycp 2006-10-10 12:50:58.000000000 +0200
+++ new/yast2-storage-2.14.10/storage/src/modules/Storage.ycp 2006-10-12 18:21: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 33312 2006-10-10 10:50:56Z fehr $
+ * $Id: Storage.ycp 33376 2006-10-12 16:21:15Z fehr $
*/
{
@@ -4157,6 +4157,25 @@
y2milestone( "return" );
}
+void UpdateBootFstabEvms()
+ {
+ string tabpath = PathToDestdir( "/etc/fstab" );
+ y2milestone( "UpdateBootFstabEvms %1",
+ SCR::Execute( .target.bash_output, "grep /boot " + tabpath ));
+ map fstab = Partitions::GetFstab( tabpath );
+ list lines = AsciiFile::FindLineField( fstab, 1, Partitions::BootMount() );
+ y2milestone( "UpdateBootFstabEvms lines %1", lines );
+ map l = AsciiFile::GetLine( fstab, lines[0]:-1 );
+ if( search( l["fields",0]:"", "/dev/evms" )!=0 )
+ AsciiFile::ChangeLineField( fstab, lines[0]:-1, 0,
+ "/dev/evms/"+substring(l["fields",0]:"",5));
+ AsciiFile::RewriteFile( fstab, tabpath );
+ y2milestone( "UpdateBootFstabEvms %1",
+ SCR::Execute( .target.bash_output, "grep /boot " + tabpath ));
+ }
+
+global define boolean BootEvms();
+
global define void WriteFstab()
``{
y2milestone( "WriteFstab called" );
@@ -4194,6 +4213,8 @@
Storage::AddFstabEntry( m );
num = num+1;
});
+ if( BootEvms() )
+ UpdateBootFstabEvms();
HandleModulesOnBoot( GetTargetMap() );
}
@@ -4902,7 +4923,8 @@
* @param tg Target map
* @return disks List of disks
*/
-global define list<string> GetUsedRealDisks( map tg )
+global define list<string> GetUsedRealDisksNew( map tg,
+ boolean ignore_boot )
``{
list<string> disks = [];
list lvmgr = GetUsedLvmGroups( tg );
@@ -4919,17 +4941,25 @@
``{
if( IsRealDisk( data ) &&
size( filter( map p, data["partitions"]:[],
- ``(size(p["mount"]:"")>0 ||
- contains( mdlist, p["used_by"]:"" ) ||
- contains( lvmgr, p["used_by"]:"" ) ) )) > 0 )
+ ``( (size(p["mount"]:"")>0 &&
+ (!ignore_boot ||
+ p["mount"]:""!=Partitions::BootMount())) ||
+ contains( mdlist, p["used_by"]:"" ) ||
+ contains( lvmgr, p["used_by"]:"" ) ) )) > 0 )
{
disks = add( disks, disk );
}
});
- y2milestone( "GetUsedRealDisks ret %1", disks );
+ y2milestone( "GetUsedRealDisksNew ignore_boot %1 ret %2",
+ ignore_boot, disks );
return( disks );
};
+global define list<string> GetUsedRealDisks( map tg )
+ {
+ return( GetUsedRealDisksNew( tg, false ));
+ };
+
global define list<string> GetEvmsRealDisk( map tg, map p )
``{
list<string> rdisk = [];
@@ -5011,7 +5041,7 @@
{
map tg = GetTargetMap();
list<string> evms = GetUsedEvmsDisks( tg );
- list<string> nonevms = GetUsedRealDisks( tg );
+ list<string> nonevms = GetUsedRealDisksNew( tg, true );
evms = filter( string d, evms, ``(contains( nonevms, d )));
y2milestone( "CheckEvmsNonEvms intersec %1", evms );
ret = size(evms)==0;
@@ -5721,12 +5751,22 @@
bt = ProductFeatures::GetBooleanFeature( "partitioning",
"evms_config" );
cfg_xml["evms_config"] = bt?true:false;
+ bt = ProductFeatures::GetBooleanFeature( "partitioning",
+ "evms_boot" );
+ cfg_xml["evms_boot"] = bt?true:false;
SetProposalDefault();
y2milestone( "GetControlCfg cfg_xml %1", cfg_xml );
}
return( cfg_xml );
}
+global boolean BootEvms()
+ {
+ map cfg = GetControlCfg();
+ boolean ret = cfg["evms_boot"]:false;
+ y2milestone( "BootEvms ret %1", ret );
+ return( ret );
+ }
global string ProposalVM()
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org