[Astlinux-commits] SF.net SVN: astlinux:[6332] branches/1.0

[<abe...@us...>]

Revision: 6332
          http://sourceforge.net/p/astlinux/code/6332
Author:   abelbeck
Date:     2014-01-02 15:54:25 +0000 (Thu, 02 Jan 2014)
Log Message:
-----------
apcupsd, allow to coexist with nut or not built if desired

Modified Paths:
--------------
    branches/1.0/package/apcupsd/apcupsd.init
    branches/1.0/package/apcupsd/apcupsd.mk

Removed Paths:
-------------
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K21apcupsd
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S35apcupsd

Modified: branches/1.0/package/apcupsd/apcupsd.init
===================================================================
--- branches/1.0/package/apcupsd/apcupsd.init	2013-12-30 00:51:20 UTC (rev 6331)
+++ branches/1.0/package/apcupsd/apcupsd.init	2014-01-02 15:54:25 UTC (rev 6332)
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+# Disable if ups or upsmon is running
+if [ -f /var/run/ups/upsd.pid -o -f /var/run/upsmon.pid ]; then
+  exit 0
+fi
+
 . /etc/rc.conf
 
 MANUAL_CONF="/mnt/kd/apcupsd/apcupsd.conf"

Modified: branches/1.0/package/apcupsd/apcupsd.mk
===================================================================
--- branches/1.0/package/apcupsd/apcupsd.mk	2013-12-30 00:51:20 UTC (rev 6331)
+++ branches/1.0/package/apcupsd/apcupsd.mk	2014-01-02 15:54:25 UTC (rev 6332)
@@ -62,12 +62,16 @@
 	#
 	$(INSTALL) -D -m 0755 package/apcupsd/apcupsd.init $(TARGET_DIR)/etc/init.d/apcupsd
 	ln -sf /tmp/etc/apcupsd $(TARGET_DIR)/etc/apcupsd
+	ln -sf ../../init.d/apcupsd $(TARGET_DIR)/etc/runlevels/default/S35apcupsd
+	ln -sf ../../init.d/apcupsd $(TARGET_DIR)/etc/runlevels/default/K21apcupsd
 
 apcupsd: $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY)
 
 apcupsd-source: $(APCUPSD_DIR)/.unpacked
 
 apcupsd-clean:
+	rm -f $(TARGET_DIR)/etc/runlevels/default/S35apcupsd
+	rm -f $(TARGET_DIR)/etc/runlevels/default/K21apcupsd
 	$(MAKE1) -C $(APCUPSD_DIR) uninstall DESTDIR=$(TARGET_DIR)
 	-$(MAKE) -C $(APCUPSD_DIR) clean DESTDIR=$(TARGET_DIR)
 

Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K21apcupsd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K21apcupsd	2013-12-30 00:51:20 UTC (rev 6331)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K21apcupsd	2014-01-02 15:54:25 UTC (rev 6332)
@@ -1 +0,0 @@
-link ../../init.d/apcupsd
\ No newline at end of file

Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S35apcupsd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S35apcupsd	2013-12-30 00:51:20 UTC (rev 6331)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S35apcupsd	2014-01-02 15:54:25 UTC (rev 6332)
@@ -1 +0,0 @@
-link ../../init.d/apcupsd
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.