Mailinglist Archive: opensuse-commit (1214 mails)
| < Previous | Next > |
commit libstorage for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 06 Aug 2009 22:07:01 +0200
- Message-id: <20090806200701.D29BD61B6@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package libstorage for openSUSE:Factory
checked in at Thu Aug 6 22:07:01 CEST 2009.
--------
--- libstorage/libstorage.changes 2009-07-28 11:08:31.000000000 +0200
+++ libstorage/libstorage.changes 2009-07-31 12:57:53.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jul 29 10:59:46 CEST 2009 - aschnell@xxxxxxx
+
+- fixed removing encrypted pvs from vg
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.cVjrOe/_old 2009-08-06 22:06:38.000000000 +0200
+++ /var/tmp/diff_new_pack.cVjrOe/_new 2009-08-06 22:06:38.000000000 +0200
@@ -20,7 +20,7 @@
Name: libstorage
Version: 2.18.20
-Release: 2
+Release: 3
License: GPL
Group: System/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ libstorage-2.18.20.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.18.20/storage/Disk.cc
new/libstorage-2.18.20/storage/Disk.cc
--- old/libstorage-2.18.20/storage/Disk.cc 2009-07-28 10:15:00.000000000
+0200
+++ new/libstorage-2.18.20/storage/Disk.cc 2009-08-05 15:44:14.000000000
+0200
@@ -268,14 +268,14 @@
}
else
{
- y2err("reading " << sysfsfile << " failed");
+ y2war("reading " << sysfsfile << " failed");
return false;
}
sysfsfile = sysfsdir + "/device";
if (!readlink(sysfsfile, sysfsinfo.device))
{
- y2err("reading " << sysfsfile << " failed");
+ y2war("reading " << sysfsfile << " failed");
return false;
}
@@ -288,7 +288,7 @@
}
else
{
- y2err("reading " << sysfsfile << " failed");
+ y2war("reading " << sysfsfile << " failed");
return false;
}
@@ -309,7 +309,7 @@
}
else
{
- y2err("reading " << sysfsfile << " failed");
+ y2war("reading " << sysfsfile << " failed");
return false;
}
@@ -2329,7 +2329,7 @@
}
if( !dmp_slave && call_blockdev )
{
- SystemCmd c("/sbin/blockdev --rereadpt " + quote(device()));
+ SystemCmd c(BLOCKDEVBIN " --rereadpt " + quote(device()));
if( p->type()!=EXTENDED )
Storage::waitForDevice(p->device());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.18.20/storage/LvmVg.cc
new/libstorage-2.18.20/storage/LvmVg.cc
--- old/libstorage-2.18.20/storage/LvmVg.cc 2009-07-21 16:29:32.000000000
+0200
+++ new/libstorage-2.18.20/storage/LvmVg.cc 2009-08-05 15:13:32.000000000
+0200
@@ -183,15 +183,17 @@
return( reduceVg( l ) );
}
+
int
LvmVg::reduceVg( const list<string>& devs )
{
int ret = 0;
- y2mil( "name:" << name() << " devices:" << devs );
- y2mil( "this:" << *this );
+ y2mil("name:" << name() << " devices:" << devs);
+ y2mil("this:" << *this);
+ y2mil("add:" << pv_add.size() << " pv:" << pv.size() << " remove:" <<
pv_remove.size());
checkConsistency();
- list<string>::const_iterator i=devs.begin();
+
list<Pv> pl = pv;
list<Pv> pladd = pv_add;
list<Pv> plrem = pv_remove;
@@ -200,13 +202,15 @@
{
ret = LVM_CHANGE_READONLY;
}
+
+ list<string>::const_iterator i = devs.begin();
while( ret==0 && i!=devs.end() )
{
string d = normalizeDevice( *i );
ret = tryUnusePe( d, pl, pladd, plrem, rem_pe );
++i;
}
- y2mil( "add:" << pv_add.size() << " pv:" << pv.size() << " remove:" <<
pv_remove.size() );
+
if( ret==0 && pv_add.size()+pv.size()-devs.size()<=0 )
ret = LVM_VG_HAS_NONE_PV;
if( ret == 0 )
@@ -219,9 +223,11 @@
}
if( ret==0 )
checkConsistency();
- y2mil( "this:" << *this );
+
+ y2mil("this:" << *this);
+ y2mil("add:" << pv_add.size() << " pv:" << pv.size() << " remove:" <<
pv_remove.size());
y2mil("ret:" << ret);
- return( ret );
+ return ret;
}
@@ -771,7 +777,11 @@
const Volume* v;
if (getStorage()->findVolume(p->device, v))
+ {
p->device = v->device();
+ p->dmcryptDevice = v->dmcryptDevice();
+ }
+
}
else if( line.find( "PV UUID" ) == 0 )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.18.20/storage/Nfs.cc
new/libstorage-2.18.20/storage/Nfs.cc
--- old/libstorage-2.18.20/storage/Nfs.cc 2009-07-21 16:29:32.000000000
+0200
+++ new/libstorage-2.18.20/storage/Nfs.cc 2009-07-29 10:16:30.000000000
+0200
@@ -6,7 +6,6 @@
#include "storage/Container.h"
#include "storage/AppUtil.h"
#include "storage/Storage.h"
-#include "storage/SystemCmd.h"
namespace storage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.18.20/storage/PeContainer.cc
new/libstorage-2.18.20/storage/PeContainer.cc
--- old/libstorage-2.18.20/storage/PeContainer.cc 2009-07-21
16:29:32.000000000 +0200
+++ new/libstorage-2.18.20/storage/PeContainer.cc 2009-07-29
10:32:35.000000000 +0200
@@ -604,17 +604,20 @@
s << " pv_remove:";
printDevList( s, d.pv_remove );
}
- return( s );
+ return s;
}
-std::ostream& operator<< (std::ostream& s, const PeContainer::Pv& v )
+
+ std::ostream& operator<<(std::ostream& s, const PeContainer::Pv& v)
{
- s << "device:" << v.device
- << " PE:" << v.num_pe
- << " Free:" << v.free_pe
- << " Status:" << v.status
- << " UUID:" << v.uuid;
- return( s );
+ s << "device:" << v.device;
+ if (!v.dmcryptDevice.empty())
+ s << " dmcryptDevice:" << v.dmcryptDevice;
+ s << " PE:" << v.num_pe
+ << " Free:" << v.free_pe
+ << " Status:" << v.status
+ << " UUID:" << v.uuid;
+ return s;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.18.20/storage/Storage.cc
new/libstorage-2.18.20/storage/Storage.cc
--- old/libstorage-2.18.20/storage/Storage.cc 2009-07-24 13:51:33.000000000
+0200
+++ new/libstorage-2.18.20/storage/Storage.cc 2009-08-05 15:44:14.000000000
+0200
@@ -732,7 +732,7 @@
ProcMounts& mounts )
{
y2mil("detectFsData begin");
- SystemCmd Blkid( "BLKID_SKIP_CHECK_MDRAID=1 /sbin/blkid -c /dev/null" );
+ SystemCmd Blkid("BLKID_SKIP_CHECK_MDRAID=1 " BLKIDBIN " -c /dev/null");
SystemCmd Losetup(LOSETUPBIN " -a");
for( VolIterator i=begin; i!=end; ++i )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.18.20/storage/StorageDefines.h
new/libstorage-2.18.20/storage/StorageDefines.h
--- old/libstorage-2.18.20/storage/StorageDefines.h 2009-07-21
16:29:32.000000000 +0200
+++ new/libstorage-2.18.20/storage/StorageDefines.h 2009-07-28
11:45:08.000000000 +0200
@@ -44,6 +44,9 @@
#define DDBIN "/bin/dd"
+#define BLKIDBIN "/sbin/blkid"
+#define BLOCKDEVBIN "/sbin/blockdev"
+
#define GREPBIN "/usr/bin/grep"
#define DASDFMTBIN "/sbin/dasdfmt"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.18.20/storage/Volume.cc
new/libstorage-2.18.20/storage/Volume.cc
--- old/libstorage-2.18.20/storage/Volume.cc 2009-07-23 12:58:26.000000000
+0200
+++ new/libstorage-2.18.20/storage/Volume.cc 2009-08-01 10:35:46.000000000
+0200
@@ -759,7 +759,7 @@
progressbar = new Mke2fsProgressBar( cb );
break;
case BTRFS:
- cmd = "/usr/bin/mkfs.btrfs";
+ cmd = "/sbin/mkfs.btrfs";
break;
case REISERFS:
cmd = "/sbin/mkreiserfs";
@@ -903,7 +903,7 @@
void Volume::updateFsData()
{
- SystemCmd Blkid("BLKID_SKIP_CHECK_MDRAID=1 /sbin/blkid -c /dev/null " +
quote(mountDevice()));
+ SystemCmd Blkid("BLKID_SKIP_CHECK_MDRAID=1 " BLKIDBIN " -c /dev/null " +
quote(mountDevice()));
getFsData( Blkid );
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |