From abfdbfb09c31799689ff3fdeed6a92323a084f1c Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 16:48:14 +0000
Subject: [PATCH] [packages_10.03.2] hd-idle: merge r26655, r28949, r28954,
 r29199

SVN-Revision: 30294
---
 utils/hd-idle/Makefile           |  6 +++++-
 utils/hd-idle/files/hd-idle.init | 17 +++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/utils/hd-idle/Makefile b/utils/hd-idle/Makefile
index a97445d4c8..25fb32e97d 100644
--- a/utils/hd-idle/Makefile
+++ b/utils/hd-idle/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hd-idle
 PKG_VERSION:=1.03
-PKG_RELEASE:=1
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
@@ -40,4 +40,8 @@ define Package/hd-idle/install
 	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
 endef
 
+define Package/hd-idle/conffiles
+/etc/config/hd-idle
+endef
+
 $(eval $(call BuildPackage,hd-idle))
diff --git a/utils/hd-idle/files/hd-idle.init b/utils/hd-idle/files/hd-idle.init
index 4b091be131..eb2db35e32 100644
--- a/utils/hd-idle/files/hd-idle.init
+++ b/utils/hd-idle/files/hd-idle.init
@@ -1,10 +1,7 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2008 OpenWrt.org
-START=50
+# Copyright (C) 2008-2011 OpenWrt.org
 
-SSD=start-stop-daemon
-NAME=hd-idle
-PROG=/usr/bin/$NAME
+START=50
 
 append_bool() {
 	local section="$1"
@@ -69,11 +66,8 @@ start_service() {
 	append_string "$section" "disk" "-t"
 	append_bool "$section" "enable_debug" "-d"
 	config_get_bool "enabled" "$section" "enabled" '1'
-	[ "$enabled" -gt 0 ] && $SSD -S -q -x $PROG -- "-i $(compute_seconds $interval $unit) $args"
-}
-
-stop_service() {
-	$SSD -K -q -x $PROG
+	[ "$enabled" -gt 0 ] || return 1
+	service_start /usr/bin/hd-idle -i "$(compute_seconds $interval $unit)" $args
 }
 
 start() {
@@ -82,6 +76,5 @@ start() {
 }
 
 stop() {
-	config_load "hd-idle"
-	config_foreach stop_service "hd-idle"
+	service_stop /usr/bin/hd-idle
 }
-- 
2.30.2