mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
samba: remove init script, will be started via our new settings addon
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
66cbe05430
commit
b1f39d04e0
@ -43,7 +43,4 @@ if [ "$SAMBA_SERVER" = "yes" ]; then
|
||||
mkdir -p $INSTALL/usr/config
|
||||
cp $PKG_DIR/config/smb.conf $INSTALL/usr/config/samba.conf.sample
|
||||
fi
|
||||
|
||||
mkdir -p $INSTALL/etc/init.d
|
||||
cp $PKG_DIR/scripts/* $INSTALL/etc/init.d
|
||||
fi
|
||||
|
@ -1,86 +0,0 @@
|
||||
################################################################################
|
||||
# Copyright (C) 2009-2010 OpenELEC.tv
|
||||
# http://www.openelec.tv
|
||||
#
|
||||
# This Program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
# start Samba Server
|
||||
#
|
||||
# runlevels: openelec, textmode
|
||||
|
||||
(
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
|
||||
if [ "$SAMBA_START" = "true" ]; then
|
||||
|
||||
# sleep 10 sec to be ensure network is started
|
||||
usleep 10000000
|
||||
|
||||
progress "Starting Samba server"
|
||||
|
||||
SMB_USERCONF="/storage/.config/samba.conf"
|
||||
SMB_DEFCONF="/etc/samba/smb.conf"
|
||||
SMB_CONF="/var/run/smb.conf"
|
||||
|
||||
mkdir -p /var/run
|
||||
if [ -f $SMB_USERCONF ]; then
|
||||
cp $SMB_USERCONF $SMB_CONF
|
||||
else
|
||||
cp $SMB_DEFCONF $SMB_CONF
|
||||
fi
|
||||
|
||||
# only letters & numbers permitted for username & password
|
||||
SAMBA_USERNAME=`echo $SAMBA_USERNAME | sed "s/[^a-zA-Z0-9]//g;"`
|
||||
SAMBA_PASSWORD=`echo $SAMBA_PASSWORD | sed "s/[^a-zA-Z0-9]//g;"`
|
||||
|
||||
if [ "$SAMBA_SECURITY" == "true" -a ! "$SAMBA_USERNAME" == "" -a ! "$SAMBA_PASSWORD" == "" ] ; then
|
||||
# username map: first line makes sure plain root does not work all the time
|
||||
# processing continues, so if user chooses root as username, second line overrides the first
|
||||
# this is done always in case user uses passwords in userconf.
|
||||
# many thanks to viljoviitanen for this
|
||||
echo -e "$SAMBA_PASSWORD\n$SAMBA_PASSWORD" | smbpasswd -s -a root >/dev/null 2>&1
|
||||
echo -e "nobody = root\nroot = $SAMBA_USERNAME" > /var/run/samba.map
|
||||
|
||||
# set public = no
|
||||
sed -e 's|^.[ \t]*.public.=.*| public = no |' $SMB_CONF > $SMB_CONF.tmp && \
|
||||
mv $SMB_CONF.tmp $SMB_CONF
|
||||
# remove username map (if any in userconfig)
|
||||
sed -e 's|^.[ \t]*.username map.=.*||' $SMB_CONF > $SMB_CONF.tmp && \
|
||||
mv $SMB_CONF.tmp $SMB_CONF
|
||||
# set security = share, add username map
|
||||
sed -e 's|^.[ \t]*.security.=.*| security = user\n username map = /var/run/samba.map|' $SMB_CONF > $SMB_CONF.tmp && \
|
||||
mv $SMB_CONF.tmp $SMB_CONF
|
||||
else
|
||||
# set public = yes
|
||||
sed -e 's|^.[ \t]*.public.=.*| public = yes |' $SMB_CONF > $SMB_CONF.tmp && \
|
||||
mv $SMB_CONF.tmp $SMB_CONF
|
||||
# remove username map (if any in userconfig)
|
||||
sed -e 's|^.[ \t]*.username map.=.*||' $SMB_CONF > $SMB_CONF.tmp && \
|
||||
mv $SMB_CONF.tmp $SMB_CONF
|
||||
# set security = share
|
||||
sed -e 's|^.[ \t]*.security.=.*| security = share|' $SMB_CONF > $SMB_CONF.tmp && \
|
||||
mv $SMB_CONF.tmp $SMB_CONF
|
||||
fi
|
||||
|
||||
SMB_ARG="--configfile=$SMB_CONF"
|
||||
mkdir -p /var/log/samba
|
||||
nmbd --daemon $SMB_ARG > /dev/null 2>&1
|
||||
smbd --daemon $SMB_ARG > /dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
)&
|
Loading…
x
Reference in New Issue
Block a user