Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Fedora Development (http://www.linux-archive.org/fedora-development/)
-   -   Use new API in libblkid to look for driverdiscs on removable devices (#508242) (http://www.linux-archive.org/fedora-development/335310-use-new-api-libblkid-look-driverdiscs-removable-devices-508242-a.html)

Hans de Goede 03-03-2010 05:10 PM

Use new API in libblkid to look for driverdiscs on removable devices (#508242)
 
Looks good.

Regards,

Hans


On 03/03/2010 04:05 PM, Martin Sivak wrote:

---
anaconda.spec.in | 3 ++-
loader/driverdisk.c | 3 +++
2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/anaconda.spec.in b/anaconda.spec.in
index d5181e8..bb13858 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -43,6 +43,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%define pythoncryptsetupver 0.0.6
%define mehver 0.4
%define sckeyboardver 1.3.1
+%define libblkid 2.17.1-1

BuildRequires: audit-libs-devel
BuildRequires: bzip2-devel
@@ -57,7 +58,7 @@ BuildRequires: libarchive-devel
BuildRequires: libX11-devel
BuildRequires: libXt-devel
BuildRequires: libXxf86misc-devel
-BuildRequires: libblkid-devel
+BuildRequires: libblkid-devel>= %{liblkid}
BuildRequires: libcurl-devel
BuildRequires: libnl-devel>= %{libnlver}
BuildRequires: libselinux-devel>= %{libselinuxver}
diff --git a/loader/driverdisk.c b/loader/driverdisk.c
index 4c98b27..bb6ed22 100644
--- a/loader/driverdisk.c
+++ b/loader/driverdisk.c
@@ -836,6 +836,9 @@ GSList* findDriverDiskByLabel(void)
logMessage(ERROR, "Cannot probe devices in blkid: %d", res);
return NULL;
}
+ if ((res = blkid_probe_all_removable(bCache))<0) {
+ logMessage(ERROR, "Cannot probe removable devices in blkid: %d", res);
+ }

bIter = blkid_dev_iterate_begin(bCache);
blkid_dev_set_search(bIter, "LABEL", ddLabel);


_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


All times are GMT. The time now is 11:30 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.