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/ata_id/ata_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/ata_id/ata_id.c')
| -rw-r--r-- | extras/ata_id/ata_id.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c index 34b1ccdff1..9df0fdb107 100644 --- a/extras/ata_id/ata_id.c +++ b/extras/ata_id/ata_id.c @@ -107,6 +107,8 @@ int main(int argc, char *argv[]) int fd; int rc = 0; + logging_init("ata_id"); + for (i = 1 ; i < argc; i++) { char *arg = argv[i]; @@ -167,8 +169,12 @@ int main(int argc, char *argv[]) printf("ID_MODEL=%s\n", model); printf("ID_SERIAL=%s\n", serial); printf("ID_REVISION=%s\n", revision); - } else - printf("%s_%s\n", model, serial); + } else { + if (serial[0] != '\0') + printf("%s_%s\n", model, serial); + else + printf("%s\n", model); + } close: close(fd); |