From 127f978c002bbc7c617006602705c7751fcc654e Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Tue, 28 Nov 2006 15:42:36 +0000 Subject: [PATCH] - Added vol_id search --- package/libzypp.changes | 7 +++++++ zypp/media/MediaDISK.cc | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index 5bebea8..a50778b 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 28 16:36:56 CET 2006 - mt@suse.de + +- Added search for /sbin/vol_id tool - that is in /lib/udev/vol_id + on the installation image (#213852). +- revision 4700 + +------------------------------------------------------------------- Tue Nov 28 11:44:52 CET 2006 - schubi@suse.de - Avoid duplicate pool entries; Bug 223750; second part of the fix diff --git a/zypp/media/MediaDISK.cc b/zypp/media/MediaDISK.cc index ee4d6a7..63617b3 100644 --- a/zypp/media/MediaDISK.cc +++ b/zypp/media/MediaDISK.cc @@ -27,7 +27,7 @@ #define DELAYED_VERIFY 1 -#define VOL_ID_TOOL_PATH "/sbin/vol_id" +#define VOL_ID_TOOL_PATHS { "/sbin/vol_id", "/lib/udev/vol_id", NULL} using namespace std; @@ -152,9 +152,17 @@ namespace zypp { // check if a filesystem volume using the /sbin/vol_id tool // (there is no /dev/disk link for some of them) + for(const char *vol_id_paths[] = VOL_ID_TOOL_PATHS, + **vol_id_path = vol_id_paths; + vol_id_path != NULL && *vol_id_path != NULL; + vol_id_path++) { + PathInfo vol_id_info(*vol_id_path); + if( !vol_id_info.isFile() || !vol_id_info.isXUsr()) + continue; + const char *cmd[3]; - cmd[0] = VOL_ID_TOOL_PATH; + cmd[0] = *vol_id_path; cmd[1] = dev_name.asString().c_str(); cmd[2] = NULL; -- 2.7.4