Re: [PATCH] Use new API in libblkid to look for driverdiscs on removable devices (#508242)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux