From c6dcabd393aeaac7e6746d5b89a77be90cb329a2 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 9 Nov 2011 23:43:50 +0000 Subject: [PATCH] packages/keepalived: use new service functions git-svn-id: svn://svn.openwrt.org/openwrt/packages@28920 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/keepalived/Makefile | 4 ++-- net/keepalived/files/keepalived.init | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index 4ff06739f..d7396b23b 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keepalived PKG_VERSION:=1.1.19 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= http://www.keepalived.org/software diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init index 723947cc3..2807f9201 100644 --- a/net/keepalived/files/keepalived.init +++ b/net/keepalived/files/keepalived.init @@ -1,13 +1,14 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2011 OpenWrt.org START=70 +SERVICE_USE_PID=1 + start() { - [ -f /etc/keepalived/keepalived.conf ] && /usr/sbin/keepalived + service_start /usr/sbin/keepalived } stop() { - killall keepalived + service_stop /usr/sbin/keepalived } -