From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 13 Nov 2011 22:16:18 +0000 (+0000)
Subject: packages/samba3: use new service functions
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=1f0a9f670073b8e44395bdfd570e4de7b227d196

packages/samba3: use new service functions

SVN-Revision: 29075
---

diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 1a101015de..6adaae4378 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -8,7 +8,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba3
 PKG_VERSION:=3.0.24
-PKG_RELEASE:=8
+PKG_RELEASE:=9
+
 PKG_MD5SUM:=89273f67a6d8067cbbecefaa13747153
 
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/samba/old-versions/
@@ -74,10 +75,10 @@ define Package/samba3/install
 	$(INSTALL_DATA) ./files/samba.config $(1)/etc/config/samba
 	$(INSTALL_DATA) ./files/smb.conf.template $(1)/etc/samba/
 	touch $(1)/etc/samba/smbpasswd
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbpasswd $(1)/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbd $(1)/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/nmbd $(1)/bin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbpasswd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/smbd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/source/bin/nmbd $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,samba3))
diff --git a/net/samba3/files/samba.init b/net/samba3/files/samba.init
index ad8f26850f..8ec62778e2 100755
--- a/net/samba3/files/samba.init
+++ b/net/samba3/files/samba.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2010 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
 
 START=60
 
@@ -59,11 +59,11 @@ start() {
 	config_load samba
 	config_foreach smb_header samba
 	config_foreach smb_add_share sambashare
-	smbd -D
-	nmbd -D
+	service_start /usr/sbin/smbd -D
+	service_start /usr/sbin/nmbd -D
 }
 
 stop() {
-	killall smbd
-	killall nmbd
+	service_stop /usr/sbin/smbd
+	service_stop /usr/sbin/nmbd
 }