|
 |
7ca109 |
From b26a85f06c231e488f99e698861932077aab7be5 Mon Sep 17 00:00:00 2001
|
|
|
7ca109 |
From: Jean Delvare <khali@linux-fr.org>
|
|
|
7ca109 |
Date: Mon, 6 Jul 2015 11:51:24 +0000
|
|
|
7ca109 |
Subject: [PATCH 1/6] sensors-detect: Fix systemd paths
|
|
|
7ca109 |
|
|
|
7ca109 |
---
|
|
|
7ca109 |
CHANGES | 3 +++
|
|
|
7ca109 |
prog/detect/sensors-detect | 53 ++++++++++++++++++++++++++++------------------
|
|
|
7ca109 |
2 files changed, 35 insertions(+), 21 deletions(-)
|
|
|
7ca109 |
|
|
|
7ca109 |
diff --git a/CHANGES b/CHANGES
|
|
|
7ca109 |
index a33bc42..9a761f5 100644
|
|
|
7ca109 |
--- a/CHANGES
|
|
|
7ca109 |
+++ b/CHANGES
|
|
|
7ca109 |
@@ -1,6 +1,9 @@
|
|
|
7ca109 |
lm-sensors CHANGES file
|
|
|
7ca109 |
-----------------------
|
|
|
7ca109 |
|
|
|
7ca109 |
+SVN HEAD
|
|
|
7ca109 |
+ sensors-detect: Fix systemd paths
|
|
|
7ca109 |
+
|
|
|
7ca109 |
3.4.0 (2015-06-25)
|
|
|
7ca109 |
documentation: Update the note about libsensors license
|
|
|
7ca109 |
sensors.conf.5: Enhance the hysteresis documentation
|
|
|
7ca109 |
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
|
|
|
7ca109 |
index fb6658c..6c0c566 100755
|
|
|
7ca109 |
--- a/prog/detect/sensors-detect
|
|
|
7ca109 |
+++ b/prog/detect/sensors-detect
|
|
|
7ca109 |
@@ -2728,7 +2728,7 @@ sub isa_read_i5d6
|
|
|
7ca109 |
# AUTODETECTION #
|
|
|
7ca109 |
#################
|
|
|
7ca109 |
|
|
|
7ca109 |
-use vars qw($dev_i2c $sysfs_root);
|
|
|
7ca109 |
+use vars qw($dev_i2c $sysfs_root $systemd_systemctl $systemd_system_dir);
|
|
|
7ca109 |
|
|
|
7ca109 |
sub initialize_conf
|
|
|
7ca109 |
{
|
|
|
7ca109 |
@@ -2789,6 +2789,19 @@ sub initialize_conf
|
|
|
7ca109 |
exit -1;
|
|
|
7ca109 |
}
|
|
|
7ca109 |
}
|
|
|
7ca109 |
+
|
|
|
7ca109 |
+ # Detect systemd presence and paths
|
|
|
7ca109 |
+ if (-x "/usr/bin/systemctl") {
|
|
|
7ca109 |
+ $systemd_systemctl = "/usr/bin/systemctl";
|
|
|
7ca109 |
+ } elsif (-x "/bin/systemctl") {
|
|
|
7ca109 |
+ $systemd_systemctl = "/bin/systemctl";
|
|
|
7ca109 |
+ }
|
|
|
7ca109 |
+
|
|
|
7ca109 |
+ if (-d "/usr/lib/systemd/system") {
|
|
|
7ca109 |
+ $systemd_system_dir = "/usr/lib/systemd/system";
|
|
|
7ca109 |
+ } elsif (-d "/lib/systemd/system") {
|
|
|
7ca109 |
+ $systemd_system_dir = "/lib/systemd/system";
|
|
|
7ca109 |
+ }
|
|
|
7ca109 |
}
|
|
|
7ca109 |
|
|
|
7ca109 |
# [0] -> VERSION
|
|
|
7ca109 |
@@ -7090,19 +7103,16 @@ EOT
|
|
|
7ca109 |
print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
|
|
|
7ca109 |
close(SYSCONFIG);
|
|
|
7ca109 |
|
|
|
7ca109 |
- if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
|
|
|
7ca109 |
- ! -f "/lib/systemd/system/lm_sensors.service") {
|
|
|
7ca109 |
- print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".
|
|
|
7ca109 |
- "and run 'systemctl enable lm_sensors.service'\n".
|
|
|
7ca109 |
- "for initialization at boot time.\n";
|
|
|
7ca109 |
- return;
|
|
|
7ca109 |
- }
|
|
|
7ca109 |
-
|
|
|
7ca109 |
- if (-x "/bin/systemctl" &&
|
|
|
7ca109 |
- -f "/lib/systemd/system/lm_sensors.service") {
|
|
|
7ca109 |
- system("/bin/systemctl", "enable", "lm_sensors.service");
|
|
|
7ca109 |
- system("/bin/systemctl", "start", "lm_sensors.service");
|
|
|
7ca109 |
- # All done, don't check for /etc/init.d/lm_sensors
|
|
|
7ca109 |
+ if ($systemd_systemctl && $systemd_system_dir) {
|
|
|
7ca109 |
+ if (-f "$systemd_system_dir/lm_sensors.service") {
|
|
|
7ca109 |
+ system($systemd_systemctl, "enable", "lm_sensors.service");
|
|
|
7ca109 |
+ system($systemd_systemctl, "start", "lm_sensors.service");
|
|
|
7ca109 |
+ # All done, don't check for /etc/init.d/lm_sensors
|
|
|
7ca109 |
+ } else {
|
|
|
7ca109 |
+ print "Copy prog/init/lm_sensors.service to $systemd_system_dir\n".
|
|
|
7ca109 |
+ "and run 'systemctl enable lm_sensors.service'\n".
|
|
|
7ca109 |
+ "for initialization at boot time.\n";
|
|
|
7ca109 |
+ }
|
|
|
7ca109 |
return;
|
|
|
7ca109 |
}
|
|
|
7ca109 |
|
|
|
7ca109 |
@@ -7170,13 +7180,6 @@ sub main
|
|
|
7ca109 |
exit -1;
|
|
|
7ca109 |
}
|
|
|
7ca109 |
|
|
|
7ca109 |
- if (-x "/bin/systemctl" && -f "/lib/systemd/system/lm_sensors.service") {
|
|
|
7ca109 |
- system("/bin/systemctl", "stop", "lm_sensors.service");
|
|
|
7ca109 |
- } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
|
|
|
7ca109 |
- -f "/var/lock/subsys/lm_sensors") {
|
|
|
7ca109 |
- system("/sbin/service", "lm_sensors", "stop");
|
|
|
7ca109 |
- }
|
|
|
7ca109 |
-
|
|
|
7ca109 |
initialize_kernel_version();
|
|
|
7ca109 |
initialize_conf();
|
|
|
7ca109 |
initialize_pci();
|
|
|
7ca109 |
@@ -7187,6 +7190,14 @@ sub main
|
|
|
7ca109 |
initialize_modules_supported();
|
|
|
7ca109 |
initialize_cpu_list();
|
|
|
7ca109 |
|
|
|
7ca109 |
+ if ($systemd_systemctl && $systemd_system_dir &&
|
|
|
7ca109 |
+ -f "$systemd_system_dir/lm_sensors.service") {
|
|
|
7ca109 |
+ system("$systemd_systemctl", "stop", "lm_sensors.service");
|
|
|
7ca109 |
+ } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
|
|
|
7ca109 |
+ -f "/var/lock/subsys/lm_sensors") {
|
|
|
7ca109 |
+ system("/sbin/service", "lm_sensors", "stop");
|
|
|
7ca109 |
+ }
|
|
|
7ca109 |
+
|
|
|
7ca109 |
print "# sensors-detect revision $revision\n";
|
|
|
7ca109 |
initialize_dmi_data();
|
|
|
7ca109 |
print_dmi_summary();
|
|
|
7ca109 |
--
|
|
|
7ca109 |
2.7.4
|
|
|
7ca109 |
|