b7ebf97389
Resolves: RHEL-155454, RHEL-155805, RHEL-155396, RHEL-158303, RHEL-158354, RHEL-143728, RHEL-168098, RHEL-143028
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From 51ee6986c85c060fbbd644d94553edc6854ee5d6 Mon Sep 17 00:00:00 2001
|
|
From: Luca Boccassi <luca.boccassi@gmail.com>
|
|
Date: Fri, 13 Mar 2026 11:10:47 +0000
|
|
Subject: [PATCH] udev: fix review mixup
|
|
|
|
The previous version in the PR changed variable and sanitized it
|
|
in place. The second version switched to skip if CCs are in the
|
|
string instead, but didn't move back to the original variable.
|
|
Because it's an existing variable, no CI caught it.
|
|
|
|
Follow-up for 16325b35fa6ecb25f66534a562583ce3b96d52f3
|
|
|
|
(cherry picked from commit 54f880b02ecf7362e630ffc885d1466df6ee6820)
|
|
|
|
Resolves: RHEL-158354
|
|
---
|
|
src/udev/scsi_id/scsi_id.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
|
|
index 650bf7824f..854f8ffa05 100644
|
|
--- a/src/udev/scsi_id/scsi_id.c
|
|
+++ b/src/udev/scsi_id/scsi_id.c
|
|
@@ -452,7 +452,7 @@ static int scsi_id(char *maj_min_dev) {
|
|
if (dev_scsi.tgpt_group[0] != '\0')
|
|
printf("ID_TARGET_PORT=%s\n", dev_scsi.tgpt_group);
|
|
if (dev_scsi.unit_serial_number[0] != '\0' && utf8_is_valid(dev_scsi.unit_serial_number) && !string_has_cc(dev_scsi.unit_serial_number, /* ok= */ NULL))
|
|
- printf("ID_SCSI_SERIAL=%s\n", serial_str);
|
|
+ printf("ID_SCSI_SERIAL=%s\n", dev_scsi.unit_serial_number);
|
|
goto out;
|
|
}
|
|
|