From 4fea23e0cf54a3e8445c36316299ac8c726e2939 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 9 Jan 2011 03:49:43 +0100
Subject: [PATCH] samba: rework init scripts

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/samba/install                        | 4 ++--
 packages/network/samba/scripts/{42_samba => 52_samba} | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)
 rename packages/network/samba/scripts/{42_samba => 52_samba} (98%)
 mode change 100755 => 100644

diff --git a/packages/network/samba/install b/packages/network/samba/install
index 140c69d252..4851e98c7d 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -25,6 +25,6 @@ if [ "$SAMBA_SERVER" = "yes" ]; then
   mkdir -p $INSTALL/usr/config
     cp $PKG_DIR/config/samba.conf.sample $INSTALL/usr/config
 
-  mkdir -p $INSTALL/etc/init.d/network
-    cp $PKG_DIR/scripts/* $INSTALL/etc/init.d/network
+  mkdir -p $INSTALL/etc/init.d
+    cp $PKG_DIR/scripts/* $INSTALL/etc/init.d
 fi
diff --git a/packages/network/samba/scripts/42_samba b/packages/network/samba/scripts/52_samba
old mode 100755
new mode 100644
similarity index 98%
rename from packages/network/samba/scripts/42_samba
rename to packages/network/samba/scripts/52_samba
index 9144d804fb..fc46799eff
--- a/packages/network/samba/scripts/42_samba
+++ b/packages/network/samba/scripts/52_samba
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      Copyright (C) 2009-2010 OpenELEC.tv
 #      http://www.openelec.tv
@@ -24,15 +22,13 @@
 #
 # runlevels: openelec, textmode
 
-. /etc/profile
-
 (
-  progress  "Starting Samba server"
-
   SMB_USERCONF="/storage/.config/samba.conf"
   SMB_DEFCONF="/etc/samba/smb.conf"
   SMB_ARG="--daemon"
 
+  progress  "Starting Samba server"
+
   if [ -f $SMB_USERCONF ]; then
     SMB_ARG="$SMB_ARG --configfile=$SMB_USERCONF"
   else
@@ -43,5 +39,4 @@
 
   smbd $SMB_ARG > /dev/null 2>&1
   nmbd $SMB_ARG > /dev/null 2>&1
-
 )&