diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-21 15:36:52 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-21 15:38:17 +0200 |
| commit | 37c2ebe2c596846033254928cee8cadd4b6709c6 (patch) | |
| tree | 4912268b6968c7f4a99a97fe56512304ee39732b /main/lm_sensors/sensors-detect-alpine.patch | |
| parent | 7dfd2f35971a282b7b6811097311318bcc63f27b (diff) | |
| download | aports-37c2ebe2c596846033254928cee8cadd4b6709c6.tar.bz2 aports-37c2ebe2c596846033254928cee8cadd4b6709c6.tar.xz | |
main/lm_sensors: fix sensors-detect
make it generate /etc/modules-load.d/lm_sensors.conf
fixes #4186
Diffstat (limited to 'main/lm_sensors/sensors-detect-alpine.patch')
| -rw-r--r-- | main/lm_sensors/sensors-detect-alpine.patch | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/main/lm_sensors/sensors-detect-alpine.patch b/main/lm_sensors/sensors-detect-alpine.patch index 1d5b2b2eb1..319fcec069 100644 --- a/main/lm_sensors/sensors-detect-alpine.patch +++ b/main/lm_sensors/sensors-detect-alpine.patch @@ -1,7 +1,8 @@ -diff -ru lm_sensors-3.1.0.orig/prog/detect/sensors-detect lm_sensors-3.1.0/prog/detect/sensors-detect ---- lm_sensors-3.1.0.orig/prog/detect/sensors-detect 2009-04-14 07:14:22.000000000 +0000 -+++ lm_sensors-3.1.0/prog/detect/sensors-detect 2009-04-14 07:44:48.000000000 +0000 -@@ -5282,19 +5282,24 @@ +diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect +index 08721f0..6e83e97 100755 +--- a/prog/detect/sensors-detect ++++ b/prog/detect/sensors-detect +@@ -7059,31 +7059,20 @@ sub write_config } } @@ -9,7 +10,7 @@ diff -ru lm_sensors-3.1.0.orig/prog/detect/sensors-detect lm_sensors-3.1.0/prog/ - printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ", - (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'), - ($have_sysconfig ? 'YES/no' : 'yes/NO'); -+ my $config = '/etc/conf.d/lm_sensors'; ++ my $config = '/etc/modules-load.d/lm_sensors.conf'; + my $have_config = -f $config; + printf "Do you want to \%s \%s? (\%s): ", + (-e $config ? 'overwrite' : 'generate'), @@ -27,13 +28,20 @@ diff -ru lm_sensors-3.1.0.orig/prog/detect/sensors-detect lm_sensors-3.1.0/prog/ + open(local *SYSCONFIG, ">$config") + or die "Sorry, can't create $config ($!)"; print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n"; -+ print SYSCONFIG -+ "\n". -+ "# Load modules at startup\n". -+ "LOADMODULES=yes\n\n". -+ "# Initialize sensors at startup\n". -+ "INITSENSORS=yes\n\n"; -+ - print SYSCONFIG <<'EOT'; - # This file is sourced by /etc/init.d/lm_sensors and defines the modules to - # be loaded/unloaded. +- print SYSCONFIG <<'EOT'; +-# This file is sourced by /etc/init.d/lm_sensors and defines the modules to +-# be loaded/unloaded. +-# +-# The format of this file is a shell script that simply defines variables: +-# HWMON_MODULES for hardware monitoring driver modules, and optionally +-# BUS_MODULES for any required bus driver module (for example for I2C or SPI). +- +-EOT +- print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n" ++ print SYSCONFIG join("\n", @{$bus_modules}), "\n" + if @{$bus_modules}; +- print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n"; ++ print SYSCONFIG join("\n", @{$hwmon_modules}), "\n"; + close(SYSCONFIG); + + if (-x "/bin/systemctl" && -d "/lib/systemd/system" && |