Changeset 5605

Show
Ignore:
Timestamp:
01/19/09 15:21:57 (4 years ago)
Author:
khali
Message:

Install sensors.conf.default instead of sensors.conf.eg.

Location:
lm-sensors/branches/lm-sensors-3.0.0
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/branches/lm-sensors-3.0.0/CHANGES

    r5604 r5605  
    88              Detect excessive recursion depth during expression evaluation 
    99  lm_sensors.init.suse: Delete (actual SuSE script is much different) 
     10  Makefile: Install sensors.conf.default instead of sensors.conf.eg 
    1011  maxilife scripts: Delete (driver never ported to Linux 2.6) 
    1112  sensord: Accept negative temperatures in RRD database 

  • lm-sensors/branches/lm-sensors-3.0.0/Makefile

    r5163 r5605  
    4848CC := gcc 
    4949 
    50 # This is the directory where sensors.conf will be installed, if no other 
     50# This is the directory where sensors3.conf will be installed, if no other 
    5151# configuration file is found 
    5252ETCDIR := /etc 
    … …  
    182182user_install:: 
    183183        @echo "*** Important notes:" 
    184         @echo "***  * The libsensors configuration file ($(ETCDIR)/sensors.conf) is never" 
     184        @echo "***  * The libsensors configuration file ($(ETCDIR)/sensors3.conf) is never" 
    185185        @echo "***    overwritten by our installation process, so that you won't lose" 
    186186        @echo "***    your personal settings in that file. You still can get our latest" 
    187         @echo "***    default config file in etc/sensors.conf.eg and manually copy it to" 
    188         @echo "***    $(ETCDIR)/sensors.conf if you want. You will then want to edit it" 
    189         @echo "***    to fit your needs again." 
    190         @echo "***  * The format of $(ETCDIR)/sensors.conf changed with lm-sensors 3.0.0." 
     187        @echo "***    default config file in etc/sensors.conf.default and manually copy" 
     188        @echo "***    it to $(ETCDIR)/sensors3.conf if you want. You will then want to" 
     189        @echo "***    edit it to fit your needs again." 
     190        @echo "***  * The format of $(ETCDIR)/sensors3.conf changed with lm-sensors 3.0.0." 
    191191        @echo "***    If you have a custom configuration file using the old format, you" 
    192192        @echo "***    can convert it using the sensors-conf-convert script. Otherwise just" 

  • lm-sensors/branches/lm-sensors-3.0.0/etc/Module.mk

    r5163 r5605  
    2323ETC_DIR := $(MODULE_DIR) 
    2424 
    25 ETCTARGET := $(MODULE_DIR)/sensors.conf.eg 
     25ETCTARGET := $(MODULE_DIR)/sensors.conf.default 
    2626ETCINSTALL := $(ETCDIR)/sensors3.conf 
    2727