Hello community,
here is the log from the commit of package libstorage for openSUSE:Factory
checked in at 2012-12-21 10:17:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage (Old)
and /work/SRC/openSUSE:Factory/.libstorage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage", Maintainer is "aschn...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2012-12-08
15:52:09.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes
2012-12-21 10:17:20.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Dec 19 19:42:20 CET 2012 - f...@suse.de
+
+- version 2.23.3
+- change order of vgchange/vgscan call in LvmVg to work around
+ udev not creating LVM device nodes any more (bnc#794692)
+- add function umountDeviceUns to make YCP able to prevent removal
+ of crypt helper devices when doing fstab import (bnc#794692)
+
+-------------------------------------------------------------------
Old:
----
libstorage-2.23.2.tar.bz2
New:
----
libstorage-2.23.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.rviAXK/_old 2012-12-21 10:17:21.000000000 +0100
+++ /var/tmp/diff_new_pack.rviAXK/_new 2012-12-21 10:17:21.000000000 +0100
@@ -17,7 +17,7 @@
Name: libstorage
-Version: 2.23.2
+Version: 2.23.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: libstorage-%{version}.tar.bz2
++++++ libstorage-2.23.2.tar.bz2 -> libstorage-2.23.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.23.2/VERSION
new/libstorage-2.23.3/VERSION
--- old/libstorage-2.23.2/VERSION 2012-12-07 16:52:36.000000000 +0100
+++ new/libstorage-2.23.3/VERSION 2012-12-20 12:41:32.000000000 +0100
@@ -1 +1 @@
-2.23.2
+2.23.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.23.2/bindings/python/libstorage.py
new/libstorage-2.23.3/bindings/python/libstorage.py
--- old/libstorage-2.23.2/bindings/python/libstorage.py 2012-11-21
14:31:21.000000000 +0100
+++ new/libstorage-2.23.3/bindings/python/libstorage.py 2012-12-20
11:35:01.000000000 +0100
@@ -1667,6 +1667,7 @@
def removeBackupState(self, *args): return
_libstorage.StorageInterface_removeBackupState(self, *args)
def checkDeviceMounted(self, *args): return
_libstorage.StorageInterface_checkDeviceMounted(self, *args)
def umountDevice(self, *args): return
_libstorage.StorageInterface_umountDevice(self, *args)
+ def umountDeviceUns(self, *args): return
_libstorage.StorageInterface_umountDeviceUns(self, *args)
def mountDevice(self, *args): return
_libstorage.StorageInterface_mountDevice(self, *args)
def activateEncryption(self, *args): return
_libstorage.StorageInterface_activateEncryption(self, *args)
def mountDeviceOpts(self, *args): return
_libstorage.StorageInterface_mountDeviceOpts(self, *args)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.23.2/storage/LvmVg.cc
new/libstorage-2.23.3/storage/LvmVg.cc
--- old/libstorage-2.23.2/storage/LvmVg.cc 2012-11-15 11:55:52.000000000
+0100
+++ new/libstorage-2.23.3/storage/LvmVg.cc 2012-12-19 14:19:13.000000000
+0100
@@ -1307,8 +1307,8 @@
if (val)
{
Dm::activate(true);
- c.execute(VGSCANBIN " --mknodes");
c.execute(VGCHANGEBIN " -a y");
+ c.execute(VGSCANBIN " --mknodes");
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.23.2/storage/Storage.cc
new/libstorage-2.23.3/storage/Storage.cc
--- old/libstorage-2.23.2/storage/Storage.cc 2012-12-03 16:34:37.000000000
+0100
+++ new/libstorage-2.23.3/storage/Storage.cc 2012-12-19 19:32:53.000000000
+0100
@@ -7050,6 +7050,7 @@
const string& opts )
{
bool ret = true;
+ bool didCrsetup = false;
assertInit();
y2mil("device:" << device << " mp:" << mp << " ro:" << ro << " opts:" <<
opts);
VolIterator vol;
@@ -7058,6 +7059,8 @@
if( vol->needCrsetup() )
{
ret = vol->doCrsetup()==0;
+ if( ret==0 )
+ didCrsetup = true;
}
if( ret )
{
@@ -7066,7 +7069,7 @@
ret = vol->mount( mp, ro )==0;
vol->setFstabOption( save );
}
- if( !ret )
+ if( !ret && didCrsetup )
vol->crUnsetup();
}
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.23.2/storage/Storage.h
new/libstorage-2.23.3/storage/Storage.h
--- old/libstorage-2.23.2/storage/Storage.h 2012-10-01 12:05:25.000000000
+0200
+++ new/libstorage-2.23.3/storage/Storage.h 2012-12-19 19:37:44.000000000
+0100
@@ -459,6 +459,8 @@
bool checkDeviceMounted(const string& device, list<string>& mps);
bool umountDevice( const string& device )
{ return( umountDev( device, true )); }
+ bool umountDeviceUns( const string& device, bool unsetup )
+ { return( umountDev( device, unsetup )); }
bool umountDev( const string& device, bool dounsetup=false );
bool mountDev( const string& device, const string& mp, bool ro=true,
const string& opts="" );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libstorage-2.23.2/storage/StorageInterface.h
new/libstorage-2.23.3/storage/StorageInterface.h
--- old/libstorage-2.23.2/storage/StorageInterface.h 2012-09-12
18:29:29.000000000 +0200
+++ new/libstorage-2.23.3/storage/StorageInterface.h 2012-12-19
19:37:04.000000000 +0100
@@ -2590,7 +2590,8 @@
/**
* Umount the given device and do what is necessary to remove
- * underlying volume (e.g. do losetup -d if loop is set up)
+ * underlying volume (e.g. do losetup -d if loop is set up or
+ * dmsetup remove if dmcrypt is used)
*
* The function umounts at once, /etc/fstab is unaffected
*
@@ -2600,6 +2601,20 @@
virtual bool umountDevice( const string& device ) = 0;
/**
+ * Umount the given device and dependent of parameter unsetup
+ * do what is necessary to remove underlying volume (e.g. do
+ * losetup -d if loop is set up or dmsetup remove if dmcrypt
+ * is used
+ *
+ * The function umounts at once, /etc/fstab is unaffected
+ *
+ * @param device device name to umount
+ * @param unsetup flag if losetup/dmcrypt should be removed
+ * @return bool if umount succeeded
+ */
+ virtual bool umountDeviceUns( const string& device, bool unsetup ) = 0;
+
+ /**
* Mount the given device and do what is necessary to access
* volume (e.g. do losetup if loop is set up)
*
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
