Export ID_WWN_VENDOR_EXTENSION and ID_WWN_WITH_EXTENSION

[elogind.git] / extras / scsi_id / scsi_id.c

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 72a7257113356af7d49e9656209f1ddbe01b9bf3..5c406585561a32fdce20b5684898d2bb72265014 100644 (file)
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
  * scsi_id.c
  *
  * Main section of the scsi_id program
@@ -549,6 +550,7 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
        if (export) {
                char serial_str[MAX_SERIAL_LEN];
 
+               printf("ID_SCSI=1\n");
                printf("ID_VENDOR=%s\n", vendor_str);
                printf("ID_VENDOR_ENC=%s\n", vendor_enc_str);
                printf("ID_MODEL=%s\n", model_str);
@@ -563,6 +565,18 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
                        udev_util_replace_chars(serial_str, NULL);
                        printf("ID_SERIAL_SHORT=%s\n", serial_str);
                }
+               if (dev_scsi.wwn[0] != '\0') {
+                       printf("ID_WWN=0x%s\n", dev_scsi.wwn);
+                       if (dev_scsi.wwn_vendor_extension[0] != '\0') {
+                               printf("ID_WWN_VENDOR_EXTENSION=0x%s\n", dev_scsi.wwn_vendor_extension);
+                               printf("ID_WWN_WITH_EXTENSION=0x%s%s\n", dev_scsi.wwn, dev_scsi.wwn_vendor_extension);
+                       } else {
+                               printf("ID_WWN_WITH_EXTENSION=0x%s\n", dev_scsi.wwn);
+                       }
+               }
+               if (dev_scsi.unit_serial_number[0] != '\0') {
+                       printf("ID_SCSI_SERIAL=%s\n", dev_scsi.unit_serial_number);
+               }
                goto out;
        }