From 76ee6ed55a653356f861c0a7c757938eed0578cc Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 20 Oct 2019 03:21:48 -0500
Subject: hscript: diskid: Use syspath, not devpath

---
 hscript/disk.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'hscript')

diff --git a/hscript/disk.cc b/hscript/disk.cc
index 7773467..890ff34 100644
--- a/hscript/disk.cc
+++ b/hscript/disk.cc
@@ -76,6 +76,8 @@ bool DiskId::execute(ScriptOptions options) const {
     struct udev *udev;
     struct udev_device *device;
     const char *serial;
+    /* XXX this is *horrible* */
+    const char *syspath = ("/sys/block/" + _block.substr(5)).c_str();
 
     udev = udev_new();
     if(!udev) {
@@ -84,11 +86,11 @@ bool DiskId::execute(ScriptOptions options) const {
                      "cannot read disk information");
         return false;
     }
-    device = udev_device_new_from_syspath(udev, _block.c_str());
+    device = udev_device_new_from_syspath(udev, syspath);
     if(!device) {
         udev_unref(udev);
         output_error("installfile:" + std::to_string(line),
-                     "diskid: failed to communicate with udevd",
+                     "diskid: failed to retrieve disk from udevd",
                      "cannot read disk information");
         return false;
     }
-- 
cgit v1.2.3-70-g09d2