Changeset 5964 for lm-sensors/trunk/prog

Timestamp:

04/27/11 19:35:18 (13 months ago)

Author:

jwrdegoede

Message:

systemd integration

Location:

lm-sensors/trunk/prog

Files:

• detect/sensors-detect (modified) (3 diffs)
• init/lm_sensors.service (added)

lm-sensors/trunk/prog/detect/sensors-detect

@@ -2416 +2416 @@
                 # Try some known default udev db locations, just in case
                 if (-e '/dev/.udev.tdb' || -e '/dev/.udev'
-                 || -e '/dev/.udevdb') {
+                 || -e '/dev/.udevdb' || -e '/run/udev') {
                         $use_udev = 1;
                         $dev_i2c = '/dev/i2c-';
@@ -6460 +6460 @@
                 close(SYSCONFIG);
 
+                if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
+                    ! -f "/lib/systemd/system/lm_sensors.service") {
+                        print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".
+                              "and run 'systemctl enable lm_sensors.service'\n".
+                              "for initialization at boot time.\n";
+                        return;
+                }
+
+                if (-x "/bin/systemctl" &&
+                    -f "/lib/systemd/system/lm_sensors.service") {
+                        system("/bin/systemctl", "enable", "lm_sensors.service");
+                        system("/bin/systemctl", "start", "lm_sensors.service");
+                        # All done, don't check for /etc/init.d/lm_sensors
+                        return;
+                }
+
                 print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
                       "for initialization at boot time.\n"
@@ -6515 +6531 @@
         }
 
-        if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
-            -f "/var/lock/subsys/lm_sensors") {
+        if (-x "/bin/systemctl" && -f "/lib/systemd/system/lm_sensors.service") {
+                system("/bin/systemctl", "stop", "lm_sensors.service");
+        } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
+                 -f "/var/lock/subsys/lm_sensors") {
                 system("/sbin/service", "lm_sensors", "stop");
         }