X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=a4a866cfcf6d040e952fd6c0bc6ab8d77ba6fe09;hb=39e54555a961fa6c4c8e7d260a0e208439dc0cfa;hp=451fd355c1ad10cbe5714fadfcce14ee55818ea5;hpb=b8476286d62c82a1a0bd8de318aa3f7d835222a0;p=elogind.git

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 451fd355c..a4a866cfc 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -32,7 +32,6 @@
 #include "../../udev_utils.h"
 #include "../../logging.h"
 #include "volume_id/volume_id.h"
-#include "volume_id/dasd.h"
 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
@@ -136,7 +135,7 @@ int main(int argc, char *argv[])
 
 	vid = volume_id_open_node(node);
 	if (vid == NULL) {
-		fprintf(stderr, "error open volume\n");
+		fprintf(stderr, "%s: error open volume\n", node);
 		rc = 2;
 		goto exit;
 	}
@@ -147,10 +146,8 @@ int main(int argc, char *argv[])
 	if (volume_id_probe_all(vid, 0, size) == 0)
 		goto print;
 
-	if (volume_id_probe_dasd(vid) == 0)
-		goto print;
-
-	fprintf(stderr, "unknown volume type\n");
+	if (print != PRINT_EXPORT)
+		fprintf(stderr, "%s: unknown volume type\n", node);
 	rc = 3;
 	goto exit;