From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 9 Feb 2011 11:49:19 +0000 (+0100)
Subject: ata_id: do not print empty serial numbers to avoid unwanted trailing '_'
X-Git-Tag: 174~260
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=46df5b1baeb806f840d44fe06e0d71e335a5aebf;ds=sidebyside

ata_id: do not print empty serial numbers to avoid unwanted trailing '_'
---

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index 92387e507..594cfb201 100644
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -584,8 +584,12 @@ int main(int argc, char *argv[])
 		printf("ID_MODEL=%s\n", model);
 		printf("ID_MODEL_ENC=%s\n", model_enc);
 		printf("ID_REVISION=%s\n", revision);
-		printf("ID_SERIAL=%s_%s\n", model, serial);
-		printf("ID_SERIAL_SHORT=%s\n", serial);
+		if (serial[0] != '\0') {
+			printf("ID_SERIAL=%s_%s\n", model, serial);
+			printf("ID_SERIAL_SHORT=%s\n", serial);
+		} else {
+			printf("ID_SERIAL=%s\n", model);
+		}
 
 		if (id.command_set_1 & (1<<5)) {
 			printf ("ID_ATA_WRITE_CACHE=1\n");