summaryrefslogtreecommitdiff
path: root/extra/lm_sensors
diff options
context:
space:
mode:
Diffstat (limited to 'extra/lm_sensors')
-rw-r--r--extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff44
-rw-r--r--extra/lm_sensors/sensors-detect.patch61
2 files changed, 0 insertions, 105 deletions
diff --git a/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff b/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
deleted file mode 100644
index eb3c591b9..000000000
--- a/extra/lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: lm-sensors/trunk/prog/detect/sensors-detect
-===================================================================
---- lm-sensors/trunk/prog/detect/sensors-detect (revision 5963)
-+++ lm-sensors/trunk/prog/detect/sensors-detect (revision 5964)
-@@ -2416,5 +2416,5 @@
- # Try some known default udev db locations, just in case
- if (-e '/dev/.udev.tdb' || -e '/dev/.udev'
-- || -e '/dev/.udevdb') {
-+ || -e '/dev/.udevdb' || -e '/run/udev') {
- $use_udev = 1;
- $dev_i2c = '/dev/i2c-';
-@@ -6460,4 +6460,20 @@
- close(SYSCONFIG);
-
-+ if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
-+ ! -f "/lib/systemd/system/lm_sensors.service") {
-+ print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".
-+ "and run 'systemctl enable lm_sensors.service'\n".
-+ "for initialization at boot time.\n";
-+ return;
-+ }
-+
-+ if (-x "/bin/systemctl" &&
-+ -f "/lib/systemd/system/lm_sensors.service") {
-+ system("/bin/systemctl", "enable", "lm_sensors.service");
-+ system("/bin/systemctl", "start", "lm_sensors.service");
-+ # All done, don't check for /etc/init.d/lm_sensors
-+ return;
-+ }
-+
- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
- "for initialization at boot time.\n"
-@@ -6513,7 +6497,9 @@
- exit -1;
- }
-
-- if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&
-- -f "/var/lock/subsys/lm_sensors") {
-+ if (-x "/bin/systemctl" && -f "/lib/systemd/system/lm_sensors.service") {
-+ system("/bin/systemctl", "stop", "lm_sensors.service");
-+ } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
-+ -f "/var/lock/subsys/lm_sensors") {
- system("/sbin/service", "lm_sensors", "stop");
- }
diff --git a/extra/lm_sensors/sensors-detect.patch b/extra/lm_sensors/sensors-detect.patch
deleted file mode 100644
index 1d12a2ce9..000000000
--- a/extra/lm_sensors/sensors-detect.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur lm_sensors-3.1.0/prog/detect/sensors-detect lm_sensors-3.1.0-new/prog/detect/sensors-detect
---- lm_sensors-3.1.0/prog/detect/sensors-detect 2009-03-03 20:36:33.000000000 -0500
-+++ lm_sensors-3.1.0-new/prog/detect/sensors-detect 2009-03-03 20:52:06.000000000 -0500
-@@ -5282,21 +5282,21 @@
- }
- }
-
-- my $have_sysconfig = -d '/etc/sysconfig';
-- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
-- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
-+ my $have_sysconfig = -d '/etc/conf.d';
-+ printf "Do you want to \%s /etc/conf.d/lm_sensors? (\%s): ",
-+ (-e '/etc/conf.d/lm_sensors' ? 'overwrite' : 'generate'),
- ($have_sysconfig ? 'YES/no' : 'yes/NO');
- $_ = <STDIN>;
- if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
- unless ($have_sysconfig) {
-- mkdir('/etc/sysconfig', 0777)
-- or die "Sorry, can't create /etc/sysconfig ($!)";
-+ mkdir('/etc/conf.d', 0777)
-+ or die "Sorry, can't create /etc/conf.d ($!)";
- }
-- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
-- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+ open(local *SYSCONFIG, ">/etc/conf.d/lm_sensors")
-+ or die "Sorry, can't create /etc/conf.d/lm_sensors ($!)";
- print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
- print SYSCONFIG <<'EOT';
--# This file is sourced by /etc/init.d/lm_sensors and defines the modules to
-+# This file is sourced by /etc/rc.d/lm_sensors and defines the modules to
- # be loaded/unloaded.
- #
- # The format of this file is a shell script that simply defines variables:
-@@ -5322,13 +5322,13 @@
- }
- close(SYSCONFIG);
-
-- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-+ print "Copy prog/init/lm_sensors.init to /etc/rc.d/lm_sensors\n".
- "for initialization at boot time.\n"
-- unless -f "/etc/init.d/lm_sensors";
-+ unless -f "/etc/rc.d/lm_sensors";
-
-- if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
-- system("/sbin/insserv", "/etc/init.d/lm_sensors");
-- } elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") {
-+ if (-x "/sbin/insserv" && -f "/etc/rc.d/lm_sensors") {
-+ system("/sbin/insserv", "/etc/rc.d/lm_sensors");
-+ } elsif (-x "/sbin/chkconfig" && -f "/etc/rc.d/lm_sensors") {
- system("/sbin/chkconfig", "lm_sensors", "on");
- if (-x "/sbin/service") {
- system("/sbin/service", "lm_sensors", "start");
-@@ -5377,7 +5377,7 @@
- exit -1;
- }
-
-- if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
-+ if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&
- -f "/var/lock/subsys/lm_sensors") {
- system("/sbin/service", "lm_sensors", "stop");
- }