Project

General

Profile

Actions
Copy link

Bug #7174

closed

Hal searches for fdi files in wrong directories

Added by Alexander Pyhalov about 6 years ago. Updated about 6 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Category:
-
Start date:
2016-07-06
Due date:
% Done:

100%

Estimated time:
Difficulty:
Bite-size
Tags:
needs-triage
Gerrit CR:

Description

According to https://people.freedesktop.org/~dkukawka/hal-spec-git/hal-spec.html ,
"Device Information files are read from two directories /usr/share/hal/fdi - for files provided by packages, /etc/hal/fdi - for files provided by the system administrator / user ".

Our hal currently is looking at /etc/hal/fdi and /usr/lib/hal and /etc/hal.
The fix is trivial:

diff --git a/usr/src/cmd/hal/Makefile.hal b/usr/src/cmd/hal/Makefile.hal
index fc3a54f..4715fd4 100644
--- a/usr/src/cmd/hal/Makefile.hal
+++ b/usr/src/cmd/hal/Makefile.hal
@@ -36,7 +36,7 @@ HAL_USER =            daemon
 HAL_GROUP =            daemon

 # derived from the generated config.h
-HAL_CONFIG_CPPFLAGS =  -DPACKAGE_DATA_DIR=\"/usr/lib\" \
+HAL_CONFIG_CPPFLAGS =  -DPACKAGE_DATA_DIR=\"/usr/share\" \
                        -DPACKAGE_BIN_DIR=\"/usr/bin\" \
                        -DPACKAGE_LIBEXEC_DIR=\"/usr/lib/hal\" \
                        -DPACKAGE_SCRIPT_DIR=\"/usr/lib/hal\" \

Actions
Copy link
 #1

Updated by Electric Monk about 6 years ago

  • Status changed from New to Closed
  • % Done changed from 0 to 100

git commit 1c755acb8b54d6f80f5596caa88a09843742ae97

commit  1c755acb8b54d6f80f5596caa88a09843742ae97
Author: Alexander Pyhalov <apyhalov@gmail.com>
Date:   2016-07-11T03:58:32.000Z

    7174 Hal searches for fdi files in wrong directories
    Reviewed by: Andy Stormont <astormont@racktopsystems.com>
    Reviewed by: Adam Stevko <adam.stevko@gmail.com>
    Approved by: Robert Mustacchi <rm@joyent.com>

Actions
Copy link

Also available in: Atom PDF