From 679cdbde4c230245aff2ad019149d83cf74f5e23 Mon Sep 17 00:00:00 2001
From: Shibby <shibby@openlinksys.info>
Date: Wed, 21 Mar 2012 12:44:22 +0100
Subject: [PATCH] UPS: move service to usb

- start/stop service start now with usb
- if service will not find APC UPS, then will turn off automaticaly
- add UPS to Mega-VPN build
---
 release/src/Makefile                |  2 +-
 release/src/router/nvram/defaults.c |  6 +++---
 release/src/router/rc/services.c    |  8 --------
 release/src/router/rc/ups.c         | 13 +++++++------
 release/src/router/rc/usb.c         |  9 +++++++++
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/release/src/Makefile b/release/src/Makefile
index 75fa4d0608..2b8e18ca8a 100644
--- a/release/src/Makefile
+++ b/release/src/Makefile
@@ -670,7 +670,7 @@ endif
 ## Mega-VPN
 o:
 ifeq ($(CONFIG_LINUX26),y)
-	@$(MAKE) bin OPENVPN=y NTFS=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y NO_LIBOPT=y MEDIASRV=y IPV6SUPP=y B=E BUILD_DESC="Mega-VPN" USB="USB" NOCAT=y BTCLIENT=y DNSCRYPT=y TR_EXTRAS=y
+	@$(MAKE) bin OPENVPN=y NTFS=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y NO_LIBOPT=y MEDIASRV=y IPV6SUPP=y B=E BUILD_DESC="Mega-VPN" USB="USB" NOCAT=y BTCLIENT=y DNSCRYPT=y TR_EXTRAS=y UPS=y
 endif
 
 ## Std
diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c
index f62f8dbbc0..64c4f14429 100644
--- a/release/src/router/nvram/defaults.c
+++ b/release/src/router/nvram/defaults.c
@@ -785,9 +785,9 @@ const defaults_t defaults[] = {
 	{ "nfs_exports",		""				},
 #endif
 
-#ifdef TCONFIG_UPS
-	{ "ups_enable",			"0"				},
-#endif
+//#ifdef TCONFIG_UPS
+//	{ "ups_enable",			"0"				},
+//#endif
 
 #ifdef TCONFIG_OPENVPN
 // vpn
diff --git a/release/src/router/rc/services.c b/release/src/router/rc/services.c
index 1c262a69cd..61d8fe2207 100644
--- a/release/src/router/rc/services.c
+++ b/release/src/router/rc/services.c
@@ -1972,10 +1972,6 @@ static void start_nas_services(void)
 #ifdef TCONFIG_MEDIA_SERVER
 	start_media_server();
 #endif
-#ifdef TCONFIG_UPS
-	start_ups();
-#endif
-
 }
 
 static void stop_nas_services(void)
@@ -1994,10 +1990,6 @@ static void stop_nas_services(void)
 #ifdef TCONFIG_SAMBASRV
 	stop_samba();
 #endif
-#ifdef TCONFIG_UPS
-	stop_ups();
-#endif
-
 }
 
 void restart_nas_services(int stop, int start)
diff --git a/release/src/router/rc/ups.c b/release/src/router/rc/ups.c
index c006573335..aa300b7517 100644
--- a/release/src/router/rc/ups.c
+++ b/release/src/router/rc/ups.c
@@ -12,9 +12,10 @@ void start_ups(void)
     FILE *fpm;
     FILE *fpc;
 
-//  only if enable...
-    if( nvram_match( "ups_enable", "1" ) )
-    {
+//  always copy and try start service if USB support is enable
+//  if service will not find apc ups, then will turn off automaticaly
+//    if( nvram_match( "ups_enable", "1" ) )
+//    {
 
         eval("cp", "/www/apcupsd/tomatodata.cgi", "/www/ext/cgi-bin/tomatodata.cgi");
         eval("cp", "/www/apcupsd/tomatoups.cgi", "/www/ext/cgi-bin/tomatoups.cgi");
@@ -47,7 +48,7 @@ void start_ups(void)
         chmod( "/etc/apcemail.conf", 0644 );
 */
         xstart( "apcupsd" );
-    }
+//    }
 
     return;
 }
@@ -57,7 +58,7 @@ void stop_ups(void)
     killall("apcupsd", SIGTERM);
 //    eval("rm", "/etc/apcupsd.conf");
 //    eval("rm", "/etc/apcemail.conf");
-    eval("rm", "/www/ext/cgi-bin/tomatodata.cgi");
-    eval("rm", "/www/ext/cgi-bin/tomatoups.cgi");
+//    eval("rm", "/www/ext/cgi-bin/tomatodata.cgi");
+//    eval("rm", "/www/ext/cgi-bin/tomatoups.cgi");
     return;
 }
diff --git a/release/src/router/rc/usb.c b/release/src/router/rc/usb.c
index 33d001b294..601f09f397 100644
--- a/release/src/router/rc/usb.c
+++ b/release/src/router/rc/usb.c
@@ -169,6 +169,11 @@ void start_usb(void)
 			xstart( "sd-idle" );
 		}
 #endif
+
+#ifdef TCONFIG_UPS
+		start_ups();
+#endif
+
 	}
 }
 
@@ -244,6 +249,10 @@ void stop_usb(void)
 		killall("sd-idle", SIGTERM);
 	}
 
+#ifdef TCONFIG_UPS
+	stop_ups();
+#endif
+
 	if (nvram_match("3g_usb", "0") ) {
 		if (nvram_match("3g_module", "sierra") ) {
 			modprobe_r("sierra");
-- 
2.11.4.GIT