samba: rework init scripts

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-01-09 03:49:43 +01:00
parent 966b4c470e
commit 4fea23e0cf
2 changed files with 4 additions and 9 deletions

View File

@ -25,6 +25,6 @@ if [ "$SAMBA_SERVER" = "yes" ]; then
mkdir -p $INSTALL/usr/config mkdir -p $INSTALL/usr/config
cp $PKG_DIR/config/samba.conf.sample $INSTALL/usr/config cp $PKG_DIR/config/samba.conf.sample $INSTALL/usr/config
mkdir -p $INSTALL/etc/init.d/network mkdir -p $INSTALL/etc/init.d
cp $PKG_DIR/scripts/* $INSTALL/etc/init.d/network cp $PKG_DIR/scripts/* $INSTALL/etc/init.d
fi fi

View File

@ -1,5 +1,3 @@
#!/bin/sh
################################################################################ ################################################################################
# Copyright (C) 2009-2010 OpenELEC.tv # Copyright (C) 2009-2010 OpenELEC.tv
# http://www.openelec.tv # http://www.openelec.tv
@ -24,15 +22,13 @@
# #
# runlevels: openelec, textmode # runlevels: openelec, textmode
. /etc/profile
( (
progress "Starting Samba server"
SMB_USERCONF="/storage/.config/samba.conf" SMB_USERCONF="/storage/.config/samba.conf"
SMB_DEFCONF="/etc/samba/smb.conf" SMB_DEFCONF="/etc/samba/smb.conf"
SMB_ARG="--daemon" SMB_ARG="--daemon"
progress "Starting Samba server"
if [ -f $SMB_USERCONF ]; then if [ -f $SMB_USERCONF ]; then
SMB_ARG="$SMB_ARG --configfile=$SMB_USERCONF" SMB_ARG="$SMB_ARG --configfile=$SMB_USERCONF"
else else
@ -43,5 +39,4 @@
smbd $SMB_ARG > /dev/null 2>&1 smbd $SMB_ARG > /dev/null 2>&1
nmbd $SMB_ARG > /dev/null 2>&1 nmbd $SMB_ARG > /dev/null 2>&1
)& )&