From: Jean Delvare Date: Fri, 25 May 2012 14:08:00 +0000 (+0200) Subject: scsi_id: fix truncated model in by-id device links X-Git-Tag: v184~40 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9159b90a4f78a83b8f751716f57fcf6d979676fe scsi_id: fix truncated model in by-id device links Do not forget the leading "S" when appending the serial number, otherwise we chop the last character of the model name. Addresses: https://bugzilla.novell.com/show_bug.cgi?id=763397 Signed-off-by: Jean Delvare Signed-off-by: Petr Uzel --- diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c index 8440b4cb4..5ad0c3135 100644 --- a/src/udev/scsi_id/scsi_serial.c +++ b/src/udev/scsi_id/scsi_serial.c @@ -799,6 +799,7 @@ static int do_scsi_page80_inquiry(struct udev *udev, ser_ind = prepend_vendor_model(udev, dev_scsi, &serial[1]); if (ser_ind < 0) return 1; + ser_ind++; /* for the leading 'S' */ for (i = 4; i < len + 4; i++, ser_ind++) serial[ser_ind] = buf[i]; }