diff options
| author | Greg KH <greg@press.(none)> | 2005-07-14 14:13:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-07-14 14:13:34 -0700 |
| commit | 39e54555a961fa6c4c8e7d260a0e208439dc0cfa (patch) | |
| tree | 4e38039e46fd5505c6079f39d056c301b9be7074 /extras/volume_id/vol_id.c | |
| parent | afd6b4acc8ce76f1187bf852b1404a82047d8f97 (diff) | |
| parent | 7fe082a8a42baa45ef45d82edde4f893410ebeea (diff) | |
Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay
Diffstat (limited to 'extras/volume_id/vol_id.c')
| -rw-r--r-- | extras/volume_id/vol_id.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index 451fd355c1..a4a866cfcf 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; |