[gentoo-commits] gentoo-x86 commit in sys-apps/lm_sensors/files: lm_sensors-3.0.1-sensors-detect-gentoo.patch lm_sensors-3-init.d

[Donnie Berkholz (dberkholz)]

dberkholz    08/03/17 07:59:28

  Added:                lm_sensors-3.0.1-sensors-detect-gentoo.patch
                        lm_sensors-3-init.d
  Log:
  Add the next-generation version of lm_sensors. This is now chip-independent and is userspace-only, no kernel modules. The lm_sensors 2.x code was split into this and a separate package called i2c-tools. Non-i2c hardware monitoring stays here, and i2c monitoring is provided by that package. Bump OK'd by genstef.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch?rev=1.1&content-type=text/plain

Index: lm_sensors-3.0.1-sensors-detect-gentoo.patch
===================================================================
diff -urN lm_sensors-3.0.1.orig/prog/detect/sensors-detect lm_sensors-3.0.1/prog/detect/sensors-detect
--- lm_sensors-3.0.1.orig/prog/detect/sensors-detect	2008-01-22 04:22:47.000000000 -0800
+++ lm_sensors-3.0.1/prog/detect/sensors-detect	2008-03-16 15:52:15.000000000 -0700
@@ -26,6 +26,9 @@
 # each be put in a separate file, using modules and packages. That is beyond
 # me.
 
+# Gentoo specific modifications based on a patch from Rudo Thomas
+# <thomr9am@××××××××××××××××××.cz>
+
 require 5.004;
 
 use strict;
@@ -5871,29 +5874,35 @@
       print MODPROBE_D $configfile;
       close(MODPROBE_D);
     } else {
+      print "\nIf you want to load the modules at startup, generate a config file\n",
+            "below and make sure lm_sensors gets started at boot time; e.g\n",
+            "\$ rc-update add lm_sensors default\n";
       print "To make the sensors modules behave correctly, add these lines to\n".
-            "$modules_conf:\n\n";
+            "/etc/modules.d/lm_sensors and run modules-update:\n\n";
       print "#----cut here----\n".
             $configfile.
             "#----cut here----\n\n";
     }
   }
 
-  my $have_sysconfig = -d '/etc/sysconfig';
-  printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
-         (-e '/etc/sysconfig/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 ($!)";
-    }
-    open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
-      or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-    print SYSCONFIG <<'EOT';
-#    /etc/sysconfig/lm_sensors - Defines modules loaded by
-#                                /etc/init.d/lm_sensors
+  my $have_config = -f '/etc/conf.d/lm_sensors';
+  print "\nDo you want to ".($have_config?"overwrite":"generate").
+	    " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n",
+        "  (".($have_config?"yes/NO":"YES/no")."/s): ";
+  my $reply = <STDIN>;
+
+  if (($have_config and $reply =~ /^\s*[Yy]/) or
+	  (not $have_config and not $reply =~ /^\s*[Nn]/) or
+	  $reply =~ /^\s*[Ss]/) {
+	  my $filename = "/etc/conf.d/lm_sensors";
+	  if ($reply =~ /^\s*[Ss]/) {
+		  print "Specify the file to store the configuration to: ";
+		  $filename = <STDIN>;
+	  }
+	  open(SYSCONFIG, ">".$filename)
+		  or die "Sorry, can't create $filename ($!).";
+	  print SYSCONFIG <<'EOT';
+#    /etc/conf.d/sensors - Defines modules loaded by /etc/init.d/lm_sensors
 #    Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@×××.nl>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -5921,12 +5930,21 @@
 # in order as normal variables with the special names:
 #    MODULE_0, MODULE_1, MODULE_2, etc.
 #
+# Please note that the numbers in MODULE_X must start at 0 and increase in
+# steps of 1. Any number that is missing will make the init script skip the
+# rest of the modules. Use MODULE_X_ARGS for arguments.
+#
 # List the modules that are to be loaded for your system
 #
 EOT
     print SYSCONFIG
-      "# Generated by sensors-detect on " . scalar localtime() . "\n";
+      "# Generated by sensors-detect on " . scalar localtime() . "\n\n";
     my @modules = grep /^modprobe /, split "\n", $modprobes;
+    print SYSCONFIG
+		  "# Load modules at startup\n".
+		  "LOADMODULES=yes\n\n".
+		  "# Initialize sensors at startup\n".
+		  "INITSENSORS=yes\n\n";
     my $i = 0;
     my $sysconfig = "";
     foreach (@modules) {
@@ -5936,10 +5954,8 @@
     }
     print SYSCONFIG $sysconfig;
     close(SYSCONFIG);
+    print "Done.\n";
 
-    print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-          "for initialization at boot time.\n"
-      unless -f "/etc/init.d/lm_sensors";
 
     if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
       system("/sbin/insserv", "/etc/init.d/lm_sensors");
@@ -5948,15 +5964,6 @@
             "kernel modules.\n\n";
     }
   } else {
-    print "To load everything that is needed, add this to one of the system\n".
-          "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
-    print "#----cut here----\n".
-          $modprobes.
-          (-e '/usr/bin/sensors' ?
-            "/usr/bin/sensors -s\n" :
-            "/usr/local/bin/sensors -s\n") .
-          "#----cut here----\n\n";
-
     print "If you have some drivers built into your kernel, the list above will\n".
           "contain too many modules. Skip the appropriate ones! You really\n".
           "should try these commands right now to make sure everything is\n".



1.1                  sys-apps/lm_sensors/files/lm_sensors-3-init.d

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3-init.d?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3-init.d?rev=1.1&content-type=text/plain

Index: lm_sensors-3-init.d
===================================================================
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3-init.d,v 1.1 2008/03/17 07:59:28 dberkholz Exp $

checkconfig() {
	if [ ! -f /etc/conf.d/lm_sensors ]; then
		eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect"
		return 1
	fi

	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
		if [ -z "${MODULE_0}" ]; then
			eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
			return 1
		fi
	fi
}

start() {
	checkconfig || return 1

	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
		einfo "Loading lm_sensors modules..."

		mount | grep sysfs >/dev/null 2>&1
		if [ ${?} = 0 ]; then
			if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
				ebegin "  Loading i2c-core"
				modprobe i2c-core >/dev/null 2>&1
				if [ ${?} != 0 ]; then
					eerror "    Could not load i2c-core!"
					eend 1
				fi
				( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1
				eend 0
			fi
		elif ! [ -e /proc/sys/dev/sensors ]; then
			ebegin "  Loading i2c-proc"
			modprobe i2c-proc >/dev/null 2>&1
			if [ ${?} != 0 ]; then
				eerror "    Could not load i2c-proc!"
				eend 1
			fi
			[ -e /proc/sys/dev/sensors ] || return 1
			eend 0
		fi

		i=0
		while true; do
			module=`eval echo '$'MODULE_${i}`
			module_args=`eval echo '$'MODULE_${i}_ARGS`
			if [ -z "${module}" ]; then
				break
			fi
			ebegin "  Loading ${module}"
			modprobe ${module} ${module_args} >/dev/null 2>&1
			eend $?
			i=$(($i+1))
		done
	fi

	if [ "${INITSENSORS}" = "yes" ]; then
		if ! [ -f /etc/sensors3.conf ]; then
			eerror "/etc/sensors3.conf does not exist!"
			return 1
		fi

		ebegin "Initializing sensors"
		/usr/bin/sensors -s >/dev/null 2>&1
		eend ${?}
	fi
}

stop() {
	checkconfig || return 1

	if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
		einfo "Unloading lm_sensors modules..."

		# find the highest possible MODULE_ number
		i=0
		while true; do
			module=`eval echo '$'MODULE_${i}`
			if [ -z "${module}" ] ; then
				break
			fi
			i=$(($i+1))
		done

		while [ ${i} -gt 0 ]; do
			i=$(($i-1))
			module=`eval echo '$'MODULE_${i}`
			ebegin "  Unloading ${module}"
			rmmod ${module} >/dev/null 2>&1
			eend $?
		done

		if [ -e /proc/sys/dev/sensors ] ; then
			ebegin "  Unloading i2c-proc"
			rmmod i2c-proc >/dev/null 2>&1
			eend $?
		fi
	fi
}



-- 
gentoo-commits@l.g.o mailing list