diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/nbd/Makefile | 2 | ||||
| -rw-r--r-- | net/nbd/files/nbd-server.init | 40 |
2 files changed, 23 insertions, 19 deletions
diff --git a/net/nbd/Makefile b/net/nbd/Makefile index 4f1840298..130b31b6e 100644 --- a/net/nbd/Makefile +++ b/net/nbd/Makefile @@ -53,7 +53,7 @@ endef CONFIGURE_ARGS += \ --disable-glibtest -TARGET_CFLAGS += --std=gnu99 +TARGET_CFLAGS += --std=gnu99 -DNODAEMON define Package/nbd/install $(INSTALL_DIR) $(1)/usr/sbin diff --git a/net/nbd/files/nbd-server.init b/net/nbd/files/nbd-server.init index 7759219a8..ae3db2460 100644 --- a/net/nbd/files/nbd-server.init +++ b/net/nbd/files/nbd-server.init @@ -1,9 +1,11 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2012 OpenWrt.org +# Copyright (C) 2015 OpenWrt.org START=60 -SERVICE_USE_PID=1 +STOP=40 +USE_PROCD=1 +PROG=/usr/bin/nbd-server CONFIGFILE="/var/etc/nbd-server.conf" @@ -81,28 +83,30 @@ config_handle_share() { append_val_str listenaddr "$cfg" oldstyle_listenaddr } -config_read() { +start_instance() { + local cfg="$1" + local enabled - mkdir -p $(dirname $CONFIGFILE) - echo -n > $CONFIGFILE + config_get_bool enabled "$cfg" 'enabled' '0' + [ "$enabled" = 0 ] && return 1 + + procd_open_instance + procd_set_param command $PROG --config-file=$CONFIGFILE + procd_set_param file $CONFIGFILE + procd_close_instance +} +start_service() { config_load nbd-server + + mkdir -p $(dirname $CONFIGFILE) + echo "# auto-generated config file from /etc/config/nbd-server" > $CONFIGFILE config_foreach config_handle_generic nbd-server config_foreach config_handle_share share -} - -start() { - config_read - if [ "$SERVICE_ENABLED" = "1" ]; then - service_start /usr/bin/nbd-server \ - --pid-file /var/run/nbd-server.pid \ - --config-file=$CONFIGFILE - fi + config_foreach start_instance nbd-server } -stop() { - service_stop /usr/bin/nbd-server +service_triggers() { + procd_add_reload_trigger "nbd-server" } - - |