trivial fixes for *_id programs

[elogind.git] / extras / volume_id / vol_id.c

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 3048fd8062c1c43fa4129bac65f8fe1198d66f87..1b180a7734cdee351aaa46f2d46b8b13f34216e5 100644 (file)
--- 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.
@@ -95,7 +92,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 +111,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 +136,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;
        }
@@ -152,8 +149,9 @@ int main(int argc, char *argv[])
 
        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;