wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-10 16:30:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Recent versions of module-init-tools only want *.conf files under

Browse Source 
/etc/modprobe.d. So rename our configuration file to lm_sensors.conf
there. Also let "make install" rename the file if it already exists.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5760 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2009-07-24 13:52:28 +00:00
1 parent 4d3ee85bae
commit 1bb3175a5f
3 files changed
+9 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+1
View File
@@ -118,6 +118,7 @@ SRCDIRS += lib/test
MKDIR := mkdir -p
RMDIR := rmdir
RM := rm -f
MV := mv -f
BISON := bison
FLEX := flex
AR := ar
etc/Module.mk
+4
View File
@@ -28,6 +28,10 @@ install-etc:
fi
$(MKDIR) $(DESTDIR)$(BINDIR)
$(INSTALL) -m 755 $(ETC_DIR)/sensors-conf-convert $(DESTDIR)$(BINDIR)
if [ -e $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors \
-a ! -e $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors.conf ] ; then \
$(MV) $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors.conf ; \
fi
user_install :: install-etc
prog/detect/sensors-detect
+4 -4
View File
@@ -5472,8 +5472,8 @@ sub write_config
if (defined $configfile) {
my $have_modprobe_d = -d '/etc/modprobe.d';
printf "Do you want to \%s /etc/modprobe.d/lm_sensors? (\%s): ",
(-e '/etc/modprobe.d/lm_sensors' ? 'overwrite' : 'generate'),
printf "Do you want to \%s /etc/modprobe.d/lm_sensors.conf? (\%s): ",
(-e '/etc/modprobe.d/lm_sensors.conf' ? 'overwrite' : 'generate'),
($have_modprobe_d ? 'YES/no' : 'yes/NO');
$_ = <STDIN>;
if (($have_modprobe_d and not m/^\s*n/i) or m/^\s*y/i) {
@@ -5481,8 +5481,8 @@ sub write_config
mkdir('/etc/modprobe.d', 0777)
or die "Sorry, can't create /etc/modprobe.d ($!)";
}
open(local *MODPROBE_D, ">/etc/modprobe.d/lm_sensors")
or die "Sorry, can't create /etc/modprobe.d/lm_sensors ($!)";
open(local *MODPROBE_D, ">/etc/modprobe.d/lm_sensors.conf")
or die "Sorry, can't create /etc/modprobe.d/lm_sensors.conf ($!)";
print MODPROBE_D "# Generated by sensors-detect on " . scalar localtime() . "\n";
print MODPROBE_D $configfile;
close(MODPROBE_D);