Mailinglist Archive: yast-commit (595 mails)

< Previous Next >
[yast-commit] r53991 - in /trunk/storage: libstorage/src/Dm.h libstorage/src/DmPart.cc libstorage/src/DmPart.h package/yast2-storage.changes
  • From: aschnell@xxxxxxxxxxxxxxxx
  • Date: Tue, 09 Dec 2008 12:26:42 -0000
  • Message-id: <20081209122642.4B5D7B116C@xxxxxxxxxxxxxxxx>
Author: aschnell
Date: Tue Dec 9 13:26:41 2008
New Revision: 53991

URL: http://svn.opensuse.org/viewcvs/yast?rev=53991&view=rev
Log:
- fixed defaultMountBy for partitions based on device-mapper devices (bnc
#438067)

Modified:
trunk/storage/libstorage/src/Dm.h
trunk/storage/libstorage/src/DmPart.cc
trunk/storage/libstorage/src/DmPart.h
trunk/storage/package/yast2-storage.changes

Modified: trunk/storage/libstorage/src/Dm.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.h?rev=53991&r1=53990&r2=53991&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Dm.h (original)
+++ trunk/storage/libstorage/src/Dm.h Tue Dec 9 13:26:41 2008
@@ -41,6 +41,7 @@
string sysfsPath() const;
void updateMajorMinor();

+ virtual const std::list<string> udevId() const { return
Volume::udevId(); }
friend std::ostream& operator<< (std::ostream& s, const Dm &p );
virtual void print( std::ostream& s ) const { s << *this; }
virtual string removeText( bool doing ) const;

Modified: trunk/storage/libstorage/src/DmPart.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.cc?rev=53991&r1=53990&r2=53991&view=diff
==============================================================================
--- trunk/storage/libstorage/src/DmPart.cc (original)
+++ trunk/storage/libstorage/src/DmPart.cc Tue Dec 9 13:26:41 2008
@@ -105,8 +105,10 @@
return( "/dev/disk/by-id/" + s + "_part" + decString(nr) );
}

-void DmPart::addAltUdevId( unsigned num )
- {
+
+void
+DmPart::addAltUdevId( unsigned num )
+{
list<string>::iterator i = alt_names.begin();
while( i!=alt_names.end() )
{
@@ -121,7 +123,23 @@
alt_names.push_back( udevCompleteIdPath( *j, num ));
++j;
}
+ mount_by = orig_mount_by = defaultMountBy();
+}
+
+
+const std::list<string>
+DmPart::udevId() const
+{
+ list<string> ret;
+ for (list<string>::const_iterator i = alt_names.begin();
+ i != alt_names.end(); i++)
+ {
+ if (i->find("/by-id/") != string::npos)
+ ret.push_back(*i);
}
+ return ret;
+}
+

void DmPart::getCommitActions( std::list<storage::commitAction*>& l ) const
{

Modified: trunk/storage/libstorage/src/DmPart.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.h?rev=53991&r1=53990&r2=53991&view=diff
==============================================================================
--- trunk/storage/libstorage/src/DmPart.h (original)
+++ trunk/storage/libstorage/src/DmPart.h Tue Dec 9 13:26:41 2008
@@ -32,6 +32,7 @@
void updateSize();
void getCommitActions( std::list<storage::commitAction*>& l ) const;
void addUdevData();
+ virtual const std::list<string> udevId() const;
virtual string setTypeText( bool doing=true ) const;
static bool notDeleted( const DmPart& l ) { return( !l.deleted() ); }


Modified: trunk/storage/package/yast2-storage.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=53991&r1=53990&r2=53991&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Tue Dec 9 13:26:41 2008
@@ -1,8 +1,14 @@
-------------------------------------------------------------------
+Tue Dec 09 13:24:36 CET 2008 - aschnell@xxxxxxx
+
+- fixed defaultMountBy for partitions based on device-mapper
+ devices (bnc #438067)
+- 2.17.62
+
+-------------------------------------------------------------------
Tue Dec 09 10:44:52 CET 2008 - aschnell@xxxxxxx

- marked strings for translation (bnc #457251 and bnc #457255)
-- 2.17.62

-------------------------------------------------------------------
Fri Dec 05 13:08:14 CET 2008 - aschnell@xxxxxxx

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages