Changeset 5179

Timestamp:

04/16/08 13:18:36 (5 years ago)

Author:

khali

Message:

Don't create the configuration file before it's needed.
Don't preserve configuration file customizations.
Fix permissions of the configuration file.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• prog/pwm/pwmconfig (modified) (5 diffs)

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

@@ -7 +7 @@
               Late compute statements override early ones
               Support virtual hwmon devices (#2309)
+  pwmconfig: Don't create the configuration file before it's needed
+             Don't preserve configuration file customizations
+             Fix permissions of the configuration file
   sensors-detect: Add SMSC SCH5027D detection
                   Do not access I/O ports on PPC

lm-sensors/branches/lm-sensors-3.0.0/prog/pwm/pwmconfig

@@ -10 +10 @@
 #    program has exited!!!
 #
-#    Copyright (C) 2007 Jean Delvare <khali@linux-fr.org>
+#    Copyright (C) 2007-2008 Jean Delvare <khali@linux-fr.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -502 +502 @@
         echo -n 'What should be the path to your fancontrol config file (/etc/fancontrol)? '
 
-        read X
-        if [ "$X" = "y" -o "$X" = "Y" -o "$X" = "" ]
-        then
-                X=/etc/fancontrol
-        fi
-        if [ -f $X ]
-        then
-                FCCONFIG=$X
-        else
-                echo -n "$X does not exist, shall I create it now (y)? "
-                read Y
-                if [ "$Y" = "y" -o "$Y" = "Y" -o "$Y" = "" ]
-                then
-                        touch $X
-                        chmod 0660 $X
-                        chown root.root $X
-                        FCCONFIG=$X
-                else
-                        AskPath
-                fi
+        read FCCONFIG
+        if [ "$FCCONFIG" = "" ]
+        then
+                FCCONFIG="/etc/fancontrol"
         fi
 }
@@ -527 +511 @@
 AskPath
 
+function ClearConfig {
+        FCTEMPS=""
+        FCFANS=""
+        MINTEMP=""
+        MAXTEMP=""
+        MINSTART=""
+        MINSTOP=""
+        MINPWM=""
+        MAXPWM=""
+}
+
 function LoadConfig {
+        # Nothing to do
+        if [ ! -f "$1" ]
+        then
+                ClearConfig
+                return 0
+        fi
+
         echo "Loading configuration from $1 ..."
         INTERVAL=`egrep '^INTERVAL=.*$' $1 | sed -e 's/INTERVAL= *//g'`
@@ -546 +548 @@
                 then
                         echo "Configuration appears to be outdated, discarded"
-                        FCTEMPS=""
-                        FCFANS=""
-                        MINTEMP=""
-                        MAXTEMP=""
-                        MINSTART=""
-                        MINSTOP=""
-                        MINPWM=""
-                        MAXPWM=""
+                        ClearConfig
                         return 0
                 fi
@@ -612 +607 @@
         tmpfile=`mktemp -t pwmcfg.XXXXXXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
         trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
-        egrep -v '(INTERVAL|FCTEMPS|FCFANS|MAXTEMP|MINTEMP|MINSTART|MINSTOP|MINPWM|MAXPWM)' $FCCONFIG >$tmpfile
+        echo "# Configuration file generated by pwmconfig, changes will be lost" >$tmpfile
         echo -e "INTERVAL=$INTERVAL\nFCTEMPS=$FCTEMPS\nFCFANS=$FCFANS\nMINTEMP=$MINTEMP\nMAXTEMP=$MAXTEMP\nMINSTART=$MINSTART\nMINSTOP=$MINSTOP" >>$tmpfile
         [ -n "$MINPWM" ] && echo "MINPWM=$MINPWM" >>$tmpfile
         [ -n "$MAXPWM" ] && echo "MAXPWM=$MAXPWM" >>$tmpfile
         mv $tmpfile $FCCONFIG
+        chmod +r $FCCONFIG
         #check if file was written correctly
         echo 'Configuration saved'