X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=a4a866cfcf6d040e952fd6c0bc6ab8d77ba6fe09;hb=b0f57eb066cd897dab536ee37daab4239d136d4c;hp=3048fd8062c1c43fa4129bac65f8fe1198d66f87;hpb=208f6aba21199ff4f93002eeb948d564f76843e6;p=elogind.git

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 3048fd806..a4a866cfc 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -1,11 +1,8 @@
 /*
- * udev_volume_id - udev callout to read filesystem label and uuid
+ * vol_id - udev callout to read filesystem label and uuid
  *
  * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
- *	sample udev rule for creation of a symlink with the filsystem uuid:
- *	KERNEL="sd*", PROGRAM="/sbin/udev_volume_id -u %N", SYMLINK="%c"
- *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
  *	Free Software Foundation version 2 of the License.
@@ -35,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)
 
@@ -95,7 +91,7 @@ static void set_str(char *to, const unsigned char *from, int count)
 
 int main(int argc, char *argv[])
 {
-	const char help[] = "usage: udev_volume_id [--export|-t|-l|-u] <device>\n"
+	const char help[] = "usage: vol_id [--export|-t|-l|-u] <device>\n"
 			    "       --export\n"
 			    "       -t filesystem type\n"
 			    "       -l filesystem label\n"
@@ -114,7 +110,7 @@ int main(int argc, char *argv[])
 	const char *node = NULL;
 	int rc = 0;
 
-	logging_init("udev_volume_id");
+	logging_init("vol_id");
 
 	for (i = 1 ; i < argc; i++) {
 		char *arg = argv[i];
@@ -139,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;
 	}
@@ -150,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;