Mailinglist Archive: yast-commit (396 mails)

< Previous Next >
[yast-commit] r65132 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Volume.cc package/yast2-storage.changes
Author: fehr
Date: Tue Aug 2 14:04:13 2011
New Revision: 65132

URL: http://svn.opensuse.org/viewcvs/yast?rev=65132&view=rev
Log:
call waitForDevice in checkDevice to work around possible
temporary device node removal by udev (bnc#709464)

Modified:
branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc
branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes

Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc?rev=65132&r1=65131&r2=65132&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original)
+++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Tue Aug
2 14:04:13 2011
@@ -1370,11 +1370,14 @@
int Volume::checkDevice(const string& device) const
{
struct stat sbuf;
- int ret = 0;
- if( stat(device.c_str(), &sbuf)<0 )
- ret = VOLUME_DEVICE_NOT_PRESENT;
- else if( !S_ISBLK(sbuf.st_mode) )
- ret = VOLUME_DEVICE_NOT_BLOCK;
+ int ret = getStorage()->waitForDevice(device);
+ if( ret!=0 )
+ {
+ if( stat(device.c_str(), &sbuf)<0 )
+ ret = VOLUME_DEVICE_NOT_PRESENT;
+ else if( !S_ISBLK(sbuf.st_mode) )
+ ret = VOLUME_DEVICE_NOT_BLOCK;
+ }
y2mil("checkDevice:" << device << " ret:" << ret);
return( ret );
}

Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes?rev=65132&r1=65131&r2=65132&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes
(original)
+++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue
Aug 2 14:04:13 2011
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Aug 2 14:03:30 CEST 2011 - fehr@xxxxxxx
+
+- call waitForDevice in checkDevice to work around possible
+ temporary device node removal by udev (bnc#709464)
+
+-------------------------------------------------------------------
Thu Jul 28 12:25:40 CEST 2011 - fehr@xxxxxxx

- remove subvol=@ from /etc/fstab to work around bnc#703204

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

< Previous Next >
This Thread
  • No further messages