Merge remote-tracking branch 'upstream/master' into openelec-3.2

This commit is contained in:
Stefan Saraev 2013-08-16 23:17:07 +03:00
commit 5caf868588
2 changed files with 2 additions and 6 deletions

View File

@ -46,8 +46,8 @@ fi
PKG_CONFIGURE_SCRIPT="source3/configure"
PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__proc_sys_kernel_core_pattern=yes \
libreplace_cv_HAVE_C99_VSNPRINTF=yes \
libreplace_cv_HAVE_GETADDRINFO=yes \
libreplace_cv_HAVE_IFACE_IFCONF=yes \
libreplace_cv_HAVE_GETADDRINFO=no \
libreplace_cv_HAVE_IFACE_IFCONF=no \
LINUX_LFS_SUPPORT=yes \
samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \

View File

@ -33,10 +33,6 @@
fi
if [ "$SAMBA_ENABLED" = "true" ]; then
# wait for network
wait_for_inet_addr force
progress "Starting Samba server"
SMB_USERCONF="/storage/.config/samba.conf"