Hello community,
here is the log from the commit of package yast2-storage
checked in at Sat Mar 8 00:03:17 CET 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-02-07 19:22:47.000000000 +0100
+++ yast2-storage/yast2-storage.changes 2008-03-06 09:07:30.753851000 +0100
@@ -1,0 +2,29 @@
+Mon Mar 3 16:28:57 CET 2008 - fehr@suse.de
+
+- fix detection of existing encrypted loop devices to have correct
+ encryption type set
+- version 2.16.12
+
+-------------------------------------------------------------------
+Thu Feb 28 17:01:31 CET 2008 - fehr@suse.de
+
+- do not allow mp swap for file based loop devices (bnc#363332)
+
+-------------------------------------------------------------------
+Mon Feb 25 17:40:54 CET 2008 - fehr@suse.de
+
+- ignore EVMS containers with erroneous devices (bnc#360075)
+- allow setting of mountBy to `device
+
+-------------------------------------------------------------------
+Tue Feb 19 19:55:06 CET 2008 - fehr@suse.de
+
+- fix missing fstab handling during removal of partitions on
+ DASDs (bnc#330902)
+
+-------------------------------------------------------------------
+Wed Feb 13 19:04:56 CET 2008 - fehr@suse.de
+
+- fix bug during sync between EVMS and LVM container (bnc#354415)
+
+-------------------------------------------------------------------
@@ -4 +33 @@
-- add key sb_ver with version of raid superblock to md maps (#357897)
+- add key sb_ver with version of raid superblock to md maps (bnc#357897)
@@ -23 +52 @@
-- fix handling of sun disk label (#353546)
+- fix handling of sun disk label (bnc#353546)
@@ -33 +62 @@
-- adapt size restrictions of disk label to parted (#352484)
+- adapt size restrictions of disk label to parted (bnc#352484)
@@ -40,2 +69,2 @@
-- fix problem of md parity propagation to libstorage (#349896)
-- improve text when no changes to be performed (#352583)
+- fix problem of md parity propagation to libstorage (bnc#349896)
+- improve text when no changes to be performed (bnc#352583)
@@ -47,3 +76,3 @@
-- change mount-string of ntfs to "ntfs-3g" (#350539)
-- extend known options to recognize new ntfs-3g option (#350539)
-- fix propagation of hotpluggable property to target map (#350539)
+- change mount-string of ntfs to "ntfs-3g" (bnc#350539)
+- extend known options to recognize new ntfs-3g option (bnc#350539)
+- fix propagation of hotpluggable property to target map (bnc#350539)
@@ -54 +83 @@
-- prevent endless loop in proposal code (#343900)
+- prevent endless loop in proposal code (bnc#343900)
@@ -61 +90 @@
- contains a valid home filesystem (#249380)
+ contains a valid home filesystem (bnc#249380)
@@ -71 +100 @@
-- do not create fstab entries for floppy drives (#344483)
+- do not create fstab entries for floppy drives (bnc#344483)
@@ -76 +105 @@
-- require pam_mount to be installed when encryption is used (#345177)
+- require pam_mount to be installed when encryption is used (bnc#345177)
Old:
----
yast2-storage-2.16.11.tar.bz2
New:
----
yast2-storage-2.16.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.bv4519/_old 2008-03-08 00:01:11.000000000 +0100
+++ /var/tmp/diff_new_pack.bv4519/_new 2008-03-08 00:01:11.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.16.11)
+# spec file for package yast2-storage (Version 2.16.12)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,13 +10,14 @@
# norootforbuild
+
Name: yast2-storage
-Version: 2.16.11
+Version: 2.16.12
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.16.11.tar.bz2
+Source0: yast2-storage-2.16.12.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-perl-bindings yast2-testsuite
Requires: parted yast2-storage-lib yast2-perl-bindings mdadm lvm2 dmraid kpartx cryptsetup
@@ -45,7 +46,7 @@
%prep
-%setup -n yast2-storage-2.16.11
+%setup -n yast2-storage-2.16.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -170,9 +171,24 @@
%doc %{prefix}/share/doc/packages/yast2-storage/examples
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
+
%changelog
+* Mon Mar 03 2008 fehr@suse.de
+- fix detection of existing encrypted loop devices to have correct
+ encryption type set
+- version 2.16.12
+* Thu Feb 28 2008 fehr@suse.de
+- do not allow mp swap for file based loop devices (bnc#363332)
+* Mon Feb 25 2008 fehr@suse.de
+- ignore EVMS containers with erroneous devices (bnc#360075)
+- allow setting of mountBy to `device
+* Tue Feb 19 2008 fehr@suse.de
+- fix missing fstab handling during removal of partitions on
+ DASDs (bnc#330902)
+* Wed Feb 13 2008 fehr@suse.de
+- fix bug during sync between EVMS and LVM container (bnc#354415)
* Thu Feb 07 2008 fehr@suse.de
-- add key sb_ver with version of raid superblock to md maps (#357897)
+- add key sb_ver with version of raid superblock to md maps (bnc#357897)
- version 2.16.11
* Tue Feb 05 2008 fehr@suse.de
- force inode size of 128 to work around bnc#358483
@@ -182,33 +198,33 @@
- do disk partitionig in separate step before proposal screen
- version 2.16.9
* Thu Jan 17 2008 fehr@suse.de
-- fix handling of sun disk label (#353546)
+- fix handling of sun disk label (bnc#353546)
* Wed Jan 16 2008 fehr@suse.de
- make sure NFS entries in fstab get zero passno field
* Tue Jan 15 2008 fehr@suse.de
-- adapt size restrictions of disk label to parted (#352484)
+- adapt size restrictions of disk label to parted (bnc#352484)
- use gpt as default disk label for disks larger 2TB
- merge proofread texts back into ycp
* Thu Jan 10 2008 fehr@suse.de
-- fix problem of md parity propagation to libstorage (#349896)
-- improve text when no changes to be performed (#352583)
+- fix problem of md parity propagation to libstorage (bnc#349896)
+- improve text when no changes to be performed (bnc#352583)
- version 2.16.8
* Mon Jan 07 2008 fehr@suse.de
-- change mount-string of ntfs to "ntfs-3g" (#350539)
-- extend known options to recognize new ntfs-3g option (#350539)
-- fix propagation of hotpluggable property to target map (#350539)
+- change mount-string of ntfs to "ntfs-3g" (bnc#350539)
+- extend known options to recognize new ntfs-3g option (bnc#350539)
+- fix propagation of hotpluggable property to target map (bnc#350539)
* Wed Dec 19 2007 fehr@suse.de
-- prevent endless loop in proposal code (#343900)
+- prevent endless loop in proposal code (bnc#343900)
- version 2.16.7
* Tue Dec 18 2007 fehr@suse.de
- do not propose to format partition for /home if it already
- contains a valid home filesystem (#249380)
+ contains a valid home filesystem (bnc#249380)
* Fri Dec 14 2007 locilka@suse.cz
- Added a draft of documentation to Storage.ycp
* Wed Dec 12 2007 fehr@suse.de
-- do not create fstab entries for floppy drives (#344483)
+- do not create fstab entries for floppy drives (bnc#344483)
* Tue Dec 11 2007 fehr@suse.de
-- require pam_mount to be installed when encryption is used (#345177)
+- require pam_mount to be installed when encryption is used (bnc#345177)
- change LILO to GRUB in helptext (#309129)
- fix a bunch of problems with translatable texts (#325687)
* Wed Nov 28 2007 aschnell@suse.de
++++++ yast2-storage-2.16.11.tar.bz2 -> yast2-storage-2.16.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.11/libstorage/src/Dasd.cc new/yast2-storage-2.16.12/libstorage/src/Dasd.cc
--- old/yast2-storage-2.16.11/libstorage/src/Dasd.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.16.12/libstorage/src/Dasd.cc 2008-02-19 16:55:52.000000000 +0100
@@ -398,6 +398,7 @@
if( i->deleted() )
{
rem_list.push_back( &(*i) );
+ i->prepareRemove();
}
if( i->created() )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.11/libstorage/src/EvmsCo.cc new/yast2-storage-2.16.12/libstorage/src/EvmsCo.cc
--- old/yast2-storage-2.16.11/libstorage/src/EvmsCo.cc 2008-01-15 18:19:16.000000000 +0100
+++ new/yast2-storage-2.16.12/libstorage/src/EvmsCo.cc 2008-02-25 17:32:31.000000000 +0100
@@ -40,10 +40,13 @@
init();
container = true;
lvm1 = cont.lvm1;
- getCoData( cont.name, data, false );
- EvmsPair p=evmsPair(lvNotCreated);
- if( !p.empty() )
- getStorage()->waitForDevice( p.begin()->device() );
+ valid = getCoData( cont.name, data, false );
+ if( valid )
+ {
+ EvmsPair p=evmsPair(lvNotCreated);
+ if( !p.empty() )
+ getStorage()->waitForDevice( p.begin()->device() );
+ }
}
EvmsCo::EvmsCo( Storage * const s, const string& name, bool lv1 ) :
@@ -584,9 +587,10 @@
return( ret );
}
-void EvmsCo::getCoData( const string& name, const EvmsTree& data, bool check )
+bool EvmsCo::getCoData( const string& name, const EvmsTree& data, bool check )
{
y2milestone( "name:%s check:%d", name.c_str(), check );
+ bool ret = true;
list<EvmsCont>::const_iterator co=data.cont.begin();
while( co!=data.cont.end() && name!=co->name )
++co;
@@ -607,38 +611,95 @@
pe_size = co->peSize;
num_pe = co->sizeK/pe_size;
free_pe = co->free/pe_size;
- for( list<unsigned>::const_iterator i=co->creates.begin();
- i!=co->creates.end(); ++i )
+ listEvmsCont::peinfo::const_iterator i=co->consumes.begin();
+ string dev;
+ while( ret && i!=co->consumes.end() )
{
- map::const_iterator oi = data.objects.find( *i );
+ map::const_iterator oi = data.objects.find( i->id );
if( oi!=data.objects.end() )
{
- map::const_iterator mi =
- data.volumes.find( oi->second.vol );
- if( mi!=data.volumes.end() )
+ if( oi->second.vol>0 )
{
- addLv( mi->second.sizeK/pe_size, mi->second.name, mi->second.native );
+ map::const_iterator mi =
+ data.volumes.find( oi->second.vol );
+ if( mi!=data.volumes.end() )
+ {
+ dev = evmsToDev( mi->second.device );
+ ret = dev.find( "Error/" )==string::npos;
+ if( !ret )
+ y2mil( "err device:" << dev );
+ }
+ else
+ y2warning( "volume not found:%u", oi->second.vol );
}
else
- y2warning( "volume not found:%u", oi->second.vol );
+ {
+ dev = oi->second.name;
+ ret = dev.find( "Error/" )==string::npos;
+ if( !ret )
+ y2mil( "err device:" << dev );
+ }
}
else
- y2warning( "object not found:%u", *i );
+ y2warning( "object not found:%u", i->id );
+ ++i;
}
- for( listEvmsCont::peinfo::const_iterator i=co->consumes.begin();
- i!=co->consumes.end(); ++i )
+ if( !ret )
+ y2milestone( "container %s contains erroneous PVs", co->name.c_str() );
+ else
{
- map::const_iterator oi = data.objects.find( i->id );
- if( oi!=data.objects.end() )
+ for( list<unsigned>::const_iterator i=co->creates.begin();
+ i!=co->creates.end(); ++i )
{
- if( oi->second.vol>0 )
+ map::const_iterator oi =
+ data.objects.find( *i );
+ if( oi!=data.objects.end() )
{
map::const_iterator mi =
data.volumes.find( oi->second.vol );
if( mi!=data.volumes.end() )
{
+ addLv( mi->second.sizeK/pe_size, mi->second.name,
+ mi->second.native );
+ }
+ else
+ y2warning( "volume not found:%u", oi->second.vol );
+ }
+ else
+ y2warning( "object not found:%u", *i );
+ }
+ for( listEvmsCont::peinfo::const_iterator i=co->consumes.begin();
+ i!=co->consumes.end(); ++i )
+ {
+ map::const_iterator oi =
+ data.objects.find( i->id );
+ if( oi!=data.objects.end() )
+ {
+ if( oi->second.vol>0 )
+ {
+ map::const_iterator mi =
+ data.volumes.find( oi->second.vol );
+ if( mi!=data.volumes.end() )
+ {
+ Pv p;
+ p.device = evmsToDev( mi->second.device );
+ y2mil( "p.device:" << p.device );
+ p.status = "allocatable";
+ p.uuid = i->uuid;
+ p.num_pe = i->size;
+ p.free_pe = i->free;
+ addPv( &p );
+ }
+ else
+ y2warning( "volume not found:%u", oi->second.vol );
+ }
+ else
+ {
Pv p;
- p.device = evmsToDev( mi->second.device );
+ p.device = oi->second.name;
+ if( p.device.find( "md/" )==0 )
+ p.device.erase(0,3);
+ p.device = "/dev/" + p.device;
y2mil( "p.device:" << p.device );
p.status = "allocatable";
p.uuid = i->uuid;
@@ -646,66 +707,51 @@
p.free_pe = i->free;
addPv( &p );
}
- else
- y2warning( "volume not found:%u", oi->second.vol );
}
else
- {
- Pv p;
- p.device = oi->second.name;
- if( p.device.find( "md/" )==0 )
- p.device.erase(0,3);
- p.device = "/dev/" + p.device;
- y2mil( "p.device:" << p.device );
- p.status = "allocatable";
- p.uuid = i->uuid;
- p.num_pe = i->size;
- p.free_pe = i->free;
- addPv( &p );
- }
+ y2warning( "object not found:%u", i->id );
}
- else
- y2warning( "object not found:%u", i->id );
- }
-
- EvmsPair p=evmsPair(lvDeleted);
- for( EvmsIter i=p.begin(); i!=p.end(); ++i )
- {
- //cout << "Deleted:" << *i << endl;
- map pe_map = i->getPeMap();
- remLvPeDistribution( i->getLe(), pe_map, pv, pv_add );
- free_pe += i->getLe();
- }
- p=evmsPair(lvCreated);
- for( EvmsIter i=p.begin(); i!=p.end(); ++i )
- {
- //cout << "Created:" << *i << endl;
- map pe_map;
- if( addLvPeDistribution( i->getLe(), i->stripes(), pv, pv_add,
- pe_map ) == 0 )
- i->setPeMap( pe_map );
- free_pe -= i->getLe();
- }
- p=evmsPair(lvResized);
- for( EvmsIter i=p.begin(); i!=p.end(); ++i )
- {
- //cout << "Resized:" << *i << endl;
- map pe_map = i->getPeMap();
- long size_diff = i->getLe() - sizeToLe(i->origSizeK());
- if( size_diff>0 )
+ EvmsPair p=evmsPair(lvDeleted);
+ for( EvmsIter i=p.begin(); i!=p.end(); ++i )
{
- if( addLvPeDistribution( size_diff, i->stripes(), pv, pv_add,
+ //cout << "Deleted:" << *i << endl;
+ map pe_map = i->getPeMap();
+ remLvPeDistribution( i->getLe(), pe_map, pv, pv_add );
+ free_pe += i->getLe();
+ }
+ p=evmsPair(lvCreated);
+ for( EvmsIter i=p.begin(); i!=p.end(); ++i )
+ {
+ //cout << "Created:" << *i << endl;
+ map pe_map;
+ if( addLvPeDistribution( i->getLe(), i->stripes(), pv, pv_add,
pe_map ) == 0 )
i->setPeMap( pe_map );
+ free_pe -= i->getLe();
}
- else if( size_diff<0 )
+ p=evmsPair(lvResized);
+ for( EvmsIter i=p.begin(); i!=p.end(); ++i )
{
- if( remLvPeDistribution( -size_diff, pe_map, pv, pv_add )==0 )
- i->setPeMap( pe_map );
+ //cout << "Resized:" << *i << endl;
+ map pe_map = i->getPeMap();
+ long size_diff = i->getLe() - sizeToLe(i->origSizeK());
+ if( size_diff>0 )
+ {
+ if( addLvPeDistribution( size_diff, i->stripes(), pv,
+ pv_add, pe_map ) == 0 )
+ i->setPeMap( pe_map );
+ }
+ else if( size_diff<0 )
+ {
+ if( remLvPeDistribution( -size_diff, pe_map, pv, pv_add )==0 )
+ i->setPeMap( pe_map );
+ }
+ free_pe -= size_diff;
}
- free_pe -= size_diff;
}
}
+ y2milestone( "ret:%d", ret );
+ return( ret );
}
void EvmsCo::getNormalVolumes( const EvmsTree& data )
@@ -1050,6 +1096,7 @@
dev += "/" + nm;
normalizeDevice(dev);
lvm1 = container = false;
+ valid = true;
}
#define SOCKET_PATH "/var/lib/YaST2/socket_libstorage_evms"
@@ -1866,6 +1913,8 @@
s << *((PeContainer*)&d);
if( d.lvm1 )
s << " lvm1";
+ if( !d.valid )
+ s << " invalid";
s << " UUID:" << d.uuid;
s << " cont:" << d.container;
return( s );
@@ -1893,6 +1942,13 @@
else
log += " cont-->";
}
+ if( valid!=p->valid )
+ {
+ if( !p->valid )
+ log += " -->invalid";
+ else
+ log += " invalid-->";
+ }
if( uuid!=p->uuid )
log += " UUID:" + uuid + "-->" + p->uuid;
y2milestone( "%s", log.c_str() );
@@ -1941,7 +1997,8 @@
if( ret && p )
{
ret = PeContainer::equalContent(*p,false) &&
- uuid==p->uuid && lvm1==p->lvm1 && container==p->container;
+ uuid==p->uuid && lvm1==p->lvm1 && container==p->container &&
+ valid==p->valid;
}
if( ret && p )
{
@@ -1965,6 +2022,7 @@
y2debug( "constructed EvmsCo by copy constructor from %s", rhs.nm.c_str() );
uuid = rhs.uuid;
lvm1 = rhs.lvm1;
+ valid = rhs.valid;
container = rhs.container;
ConstEvmsPair p = rhs.evmsPair();
for( ConstEvmsIter i = p.begin(); i!=p.end(); ++i )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.11/libstorage/src/EvmsCo.h new/yast2-storage-2.16.12/libstorage/src/EvmsCo.h
--- old/yast2-storage-2.16.11/libstorage/src/EvmsCo.h 2007-10-04 10:55:05.000000000 +0200
+++ new/yast2-storage-2.16.12/libstorage/src/EvmsCo.h 2008-02-25 17:29:57.000000000 +0100
@@ -92,6 +92,7 @@
unsigned numVol() const { return vols.size(); }
bool lvm2() const { return( !lvm1 ); }
bool isContainer() const { return( container ); }
+ bool isValid() const { return( valid ); }
static storage::CType staticType() { return storage::EVMS; }
friend std::ostream& operator<< (std::ostream&, const EvmsCo& );
@@ -182,7 +183,7 @@
EvmsCo( Storage * const s, const string& File, int );
- void getCoData( const string& name, const EvmsTree& data,
+ bool getCoData( const string& name, const EvmsTree& data,
bool check=false );
void getNormalVolumes( const EvmsTree& data );
void setUsed( const string& device, storage::UsedByType typ,
@@ -220,6 +221,7 @@
string uuid;
bool lvm1;
bool container;
+ bool valid;
static bool active;
static int sockfd;
mutable storage::EvmsCoInfo info;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.11/libstorage/src/Storage.cc new/yast2-storage-2.16.12/libstorage/src/Storage.cc
--- old/yast2-storage-2.16.11/libstorage/src/Storage.cc 2008-01-30 12:14:30.000000000 +0100
+++ new/yast2-storage-2.16.12/libstorage/src/Storage.cc 2008-02-25 17:29:20.000000000 +0100
@@ -613,11 +613,16 @@
{
y2mil( "EVMS Container:" << *i );
e = new EvmsCo( this, *i, data );
- EvmsCoIterator eco = findEvmsCo( i->name );
- if( eco != evCoEnd() )
- removeContainer( &(*eco) );
- addToList( e );
- e->checkConsistency();
+ if( e->isValid() )
+ {
+ EvmsCoIterator eco = findEvmsCo( i->name );
+ if( eco != evCoEnd() )
+ removeContainer( &(*eco) );
+ addToList( e );
+ e->checkConsistency();
+ }
+ else
+ delete( e );
}
}
}
@@ -2857,6 +2862,35 @@
}
++vi;
}
+ ep = evCoPair(evmsCo);
+ coi = ep.begin();
+ list<string> rem_co;
+ while( coi!=ep.end())
+ {
+ if( coi->name().find( "lvm/" )==0 ||
+ coi->name().find( "lvm2/" )==0 )
+ {
+ string n = coi->name();
+ y2mil("n:"<deleted())
+ rem_co.push_back( coi->device() );
+ }
+ ++coi;
+ }
+ if( rem_co.size()>0 )
+ {
+ y2mil("rem_co:" << rem_co);
+ for( list<string>::iterator s = rem_co.begin();
+ s!=rem_co.end(); s++ )
+ {
+ ContIterator cc;
+ if( findContainer( *s, cc ))
+ removeContainer( &(*cc) );
+ }
+ }
std::map::iterator i=backups.find("initial");
if( !evCoPair().empty() && i!=backups.end() )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.11/libstorage/src/Volume.cc new/yast2-storage-2.16.12/libstorage/src/Volume.cc
--- old/yast2-storage-2.16.11/libstorage/src/Volume.cc 2008-02-05 14:42:10.000000000 +0100
+++ new/yast2-storage-2.16.12/libstorage/src/Volume.cc 2008-03-03 16:22:13.000000000 +0100
@@ -1303,7 +1303,7 @@
ret = VOLUME_CRYPT_NO_PWD;
if( ret == 0 && cType()==NFSC )
ret = VOLUME_CRYPT_NFS_IMPOSSIBLE;
- if( ret==0 && format )
+ if( ret==0 && (format||loop_active) )
{
encryption = typ;
is_loop = cont->type()==LOOP;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.11/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.16.12/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.16.11/storage/src/include/custom_part_lib.ycp 2008-01-15 18:19:16.000000000 +0100
+++ new/yast2-storage-2.16.12/storage/src/include/custom_part_lib.ycp 2008-02-28 17:02:03.000000000 +0100
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 42951 2007-12-11 11:10:51Z fehr $
+ $Id: custom_part_lib.ycp 45104 2008-02-28 16:02:02Z fehr $
*
*/
@@ -372,13 +372,15 @@
``{
string mount = part["mount"]:"";
symbol used_fs = part["used_fs"]:`unknown;
+ y2milestone( "check_mount_point part:%1", part );
boolean allowed = true;
list not_allowed_system_mount_points =
[ "/proc", "/dev", "/mnt", "/var/adm/mnt", "/lost+found", "/lib",
"/bin", "/etc", "/sbin" ];
- if ( mount != "" && mount != "swap" )
+ if( mount != "" &&
+ (mount != "swap" || part["type"]:`unknown==`loop) )
{
// check if the mount point is already in use
foreach( string disk, map diskinfo, targetMap, ``{
@@ -391,7 +393,7 @@
});
});
- if( allowed == false )
+ if( allowed == false && mount!="swap" )
{
// error popup text
Popup::Error(_("This mount point is already in use. Select a different one."));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.11/storage/src/inst_disk.ycp new/yast2-storage-2.16.12/storage/src/inst_disk.ycp
--- old/yast2-storage-2.16.11/storage/src/inst_disk.ycp 2007-05-23 12:45:16.000000000 +0200
+++ new/yast2-storage-2.16.12/storage/src/inst_disk.ycp 2008-03-05 17:19:19.000000000 +0100
@@ -12,7 +12,7 @@
* Authors:
* Michael Hager
*
- * $Id: inst_disk.ycp 30805 2006-05-10 10:01:45Z fehr $
+ * $Id: inst_disk.ycp 44372 2008-02-12 09:49:01Z aschnell $
*
* Main file for disk configuration. Uses all other files.
*
@@ -57,17 +57,13 @@
if( !Storage::CheckBackupState("disk"))
Storage::CreateTargetBackup("disk");
- /******************************************************************/
- // All raid-modules communicate via the following global variables
- // and as usual via user_settings:
- /******************************************************************/
boolean installation = Stage::initial ();
y2milestone( " running in instsys %1", installation );
-define symbol InitSettings( boolean in )
+define symbol InitSettings( boolean in )
``{
return `next;
}
@@ -180,7 +176,7 @@
`next : `next ],
"ReInitSettings" : $[ `abort : "abort",
- `cancea : `cancel,
+ `cancel : `cancel,
`next : "Custom" ],
"abort" : $[ `yes : `abort,
@@ -197,7 +193,7 @@
}
/*************************************************/
- /* Let s do the work ... */
+ /* Let's do the work ... */
/*************************************************/
symbol ret = Sequencer::Run(aliases, sequence);
/*************************************************/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.11/storage/src/modules/Storage.ycp new/yast2-storage-2.16.12/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.16.11/storage/src/modules/Storage.ycp 2008-02-07 19:18:44.000000000 +0100
+++ new/yast2-storage-2.16.12/storage/src/modules/Storage.ycp 2008-02-27 12:28:13.000000000 +0100
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 44261 2008-02-07 18:18:43Z fehr $
+ * $Id: Storage.ycp 45072 2008-02-27 11:28:13Z fehr $
*/
{
@@ -1519,7 +1519,7 @@
c["devices_add"] = ls;
ls = splitstring( LibStorage::EvmsCoInfo::swig_devices_rem_get(infos), " " );
if( size(ls)>0 )
- c["devices_add"] = ls;
+ c["devices_rem"] = ls;
}
else
y2warning( "EVMS Co \"%1\" ret:%2", c["name"]:"", ret );
@@ -2661,7 +2661,7 @@
y2milestone( "ChangeVolumeProperties sint ret:%1", ret );
}
if( ret==0 && size(part["mount"]:"")>0 &&
- part["mountby"]:`device != curr["mountby"]:`device )
+ part["mountby"]:`id != curr["mountby"]:`id )
{
changed = true;
tmp = fromSymbol(conv_mountby,part["mountby"]:`device);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.11/storage/src/proposal/partitions_proposal.ycp new/yast2-storage-2.16.12/storage/src/proposal/partitions_proposal.ycp
--- old/yast2-storage-2.16.11/storage/src/proposal/partitions_proposal.ycp 2008-01-30 14:30:39.000000000 +0100
+++ new/yast2-storage-2.16.12/storage/src/proposal/partitions_proposal.ycp 2008-03-05 17:19:19.000000000 +0100
@@ -1,7 +1,7 @@
/**
* Module: proposal_partitions.ycp
*
- * $Id: partitions_proposal.ycp 44009 2008-01-30 13:30:38Z fehr $
+ * $Id: partitions_proposal.ycp 44373 2008-02-12 09:49:37Z aschnell $
*
* Author: Klaus Kaempf
*
@@ -134,7 +134,7 @@
}
else
{
- y2milestone( "ProposalActive %1 ProposalMode %2 PartMode %3",
+ y2milestone( "ProposalActive %1 ProposalMode %2 PartMode %3",
Storage::GetPartProposalActive(),
Storage::GetPartProposalMode(),
Storage::GetPartMode() );
@@ -163,7 +163,7 @@
seq["ws_start"] = "disk";
}
}
- y2milestone( "propsal sequence %1", seq );
+ y2milestone( "proposal sequence %1", seq );
Wizard::OpenNextBackDialog();
symbol result = WizardSequencer(aliases, seq);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.11/VERSION new/yast2-storage-2.16.12/VERSION
--- old/yast2-storage-2.16.11/VERSION 2008-02-07 19:22:35.000000000 +0100
+++ new/yast2-storage-2.16.12/VERSION 2008-03-05 17:18:22.000000000 +0100
@@ -1 +1 @@
-2.16.11
+2.16.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org