aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-09-12 10:09:55 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-09-12 10:09:55 +0000
commit6804bafaddec8f36c7c8fd7b0a5469d35cf8bc7f (patch)
tree3bb79bf54e541824a1c98702d75c74ddd4bae5fa /package
parent95c141aaac734343c81dc835af978c02e6b35926 (diff)
downloadupstream-6804bafaddec8f36c7c8fd7b0a5469d35cf8bc7f.tar.gz
upstream-6804bafaddec8f36c7c8fd7b0a5469d35cf8bc7f.tar.bz2
upstream-6804bafaddec8f36c7c8fd7b0a5469d35cf8bc7f.zip
mountd: add "-f" option to not daemonize mountd, use service wrappers in init script
SVN-Revision: 33378
Diffstat (limited to 'package')
-rw-r--r--package/mountd/Makefile4
-rwxr-xr-xpackage/mountd/files/mountd.init11
-rw-r--r--package/mountd/patches/040-optional-daemonize.patch13
3 files changed, 24 insertions, 4 deletions
diff --git a/package/mountd/Makefile b/package/mountd/Makefile
index 44e3082f6b..4bf8817798 100644
--- a/package/mountd/Makefile
+++ b/package/mountd/Makefile
@@ -1,11 +1,11 @@
-# Copyright (C) 2009-2011 OpenWrt.org
+# Copyright (C) 2009-2012 OpenWrt.org
# All rights reserved.
include $(TOPDIR)/rules.mk
PKG_NAME:=mountd
PKG_VERSION:=0.1
-PKG_RELEASE:=5
+PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
diff --git a/package/mountd/files/mountd.init b/package/mountd/files/mountd.init
index b861b5dda4..c294c50f5c 100755
--- a/package/mountd/files/mountd.init
+++ b/package/mountd/files/mountd.init
@@ -1,12 +1,19 @@
#!/bin/sh /etc/rc.common
+
START=80
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+SERVICE_PID_FILE=/var/run/mountd.pid
+
+MOUNTD_BIN=/sbin/mountd
+
start()
{
- /sbin/mountd
+ service_start $MOUNTD_BIN -f
}
stop()
{
- killall mountd
+ service_stop $MOUNTD_BIN
}
diff --git a/package/mountd/patches/040-optional-daemonize.patch b/package/mountd/patches/040-optional-daemonize.patch
new file mode 100644
index 0000000000..4d159ec668
--- /dev/null
+++ b/package/mountd/patches/040-optional-daemonize.patch
@@ -0,0 +1,13 @@
+--- a/main.c
++++ b/main.c
+@@ -13,7 +13,9 @@
+
+ int main(int argc, char *argv[])
+ {
+- daemon(0,0);
++ if ((argc < 2) || strcmp(argv[1], "-f"))
++ daemon(0,0);
++
+ daemonize = 1;
+ log_start();
+ log_printf("Starting OpenWrt (auto)mountd V1\n");