From 88da711007198eb2aba0aebde0ed166d7685ffc1 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 5 Feb 2012 16:31:36 +0000 Subject: [PATCH] unfs3: merge r29068, r29199 SVN-Revision: 30275 --- net/unfs3/Makefile | 8 ++++++-- net/unfs3/files/unfs3.init | 13 ++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile index a0ab326fa..3764aae3a 100644 --- a/net/unfs3/Makefile +++ b/net/unfs3/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 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:=unfs3 PKG_VERSION:=0.9.22 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -47,4 +47,8 @@ define Package/unfs3/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/unfsd $(1)/usr/sbin endef +define Package/unfs3/conffiles +/etc/exports +endef + $(eval $(call BuildPackage,unfs3)) diff --git a/net/unfs3/files/unfs3.init b/net/unfs3/files/unfs3.init index 204c4fdb4..4a5965ab9 100644 --- a/net/unfs3/files/unfs3.init +++ b/net/unfs3/files/unfs3.init @@ -1,17 +1,12 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org + START=50 start() { - /usr/sbin/unfsd + service_start /usr/sbin/unfsd } stop() { - killall unfsd -} - -restart() { - stop - sleep 1 - start + service_stop /usr/sbin/unfsd } -- 2.30.2