Ticket #1465: devicename_and_changelog.patch

File devicename_and_changelog.patch, 1.5 KB (added by Martin Ziemer, 3 years ago)

Forgot to edit changelog! -- Please look at this patch!

  • smartmontools/ChangeLog

    diff --git smartmontools/ChangeLog smartmontools/ChangeLog
    index f2ab4749..02c6ad17 100644
     
    11$Id$
    22
     32021-03-22  Martin Ziemer <horrad@horrad.de>
     4
     5        os_openbsd.cpp
     6                Use correct devicename for autodetection
     7
    382021-03-08  Christian Franke  <franke@computer.org>
    49
    510        drivedb.h:
  • smartmontools/os_openbsd.cpp

    diff --git smartmontools/os_openbsd.cpp smartmontools/os_openbsd.cpp
    index 1a20f049..0b68e97b 100644
    smart_device * openbsd_smart_interface::autodetect_smart_device(const char * nam  
    582582  if (str_starts_with(test_name, net_dev_prefix)) {
    583583    test_name += strlen(net_dev_prefix);
    584584    if (!strncmp(net_dev_ata_disk, test_name, strlen(net_dev_ata_disk)))
    585       return get_ata_device(test_name, "ata");
     585      return get_ata_device(name, "ata");
    586586    if (!strncmp(net_dev_scsi_disk, test_name, strlen(net_dev_scsi_disk))) {
    587587      // XXX Try to detect possible USB->(S)ATA bridge
    588588      // XXX get USB vendor ID, product ID and version from sd(4)/umass(4).
    589589      // XXX check sat device via get_usb_dev_type_by_id().
    590590
    591591      // No USB bridge found, assume regular SCSI device
    592       return get_scsi_device(test_name, "scsi");
     592      return get_scsi_device(name, "scsi");
    593593    }
    594594    if (!strncmp(net_dev_scsi_tape, test_name, strlen(net_dev_scsi_tape)))
    595       return get_scsi_device(test_name, "scsi");
     595      return get_scsi_device(name, "scsi");
    596596  }
    597597  // device type unknown
    598598  return 0;