mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
commit
25dc1efdce
@ -129,11 +129,7 @@
|
|||||||
# Display fatal error message
|
# Display fatal error message
|
||||||
# $1:action which caused error, $2:message
|
# $1:action which caused error, $2:message
|
||||||
echo "*** Error in $BOOT_STEP: $1: $2 ***"
|
echo "*** Error in $BOOT_STEP: $1: $2 ***"
|
||||||
if [ -z "$DEBUG" ]; then
|
debug_shell
|
||||||
halt
|
|
||||||
else
|
|
||||||
debug_shell
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
break_after() {
|
break_after() {
|
||||||
|
@ -46,8 +46,8 @@ fi
|
|||||||
PKG_CONFIGURE_SCRIPT="source3/configure"
|
PKG_CONFIGURE_SCRIPT="source3/configure"
|
||||||
PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__proc_sys_kernel_core_pattern=yes \
|
PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__proc_sys_kernel_core_pattern=yes \
|
||||||
libreplace_cv_HAVE_C99_VSNPRINTF=yes \
|
libreplace_cv_HAVE_C99_VSNPRINTF=yes \
|
||||||
libreplace_cv_HAVE_GETADDRINFO=yes \
|
libreplace_cv_HAVE_GETADDRINFO=no \
|
||||||
libreplace_cv_HAVE_IFACE_IFCONF=yes \
|
libreplace_cv_HAVE_IFACE_IFCONF=no \
|
||||||
LINUX_LFS_SUPPORT=yes \
|
LINUX_LFS_SUPPORT=yes \
|
||||||
samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
|
samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
|
||||||
samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
|
samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
|
||||||
|
@ -33,10 +33,6 @@
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$SAMBA_ENABLED" = "true" ]; then
|
if [ "$SAMBA_ENABLED" = "true" ]; then
|
||||||
|
|
||||||
# wait for network
|
|
||||||
wait_for_inet_addr force
|
|
||||||
|
|
||||||
progress "Starting Samba server"
|
progress "Starting Samba server"
|
||||||
|
|
||||||
SMB_USERCONF="/storage/.config/samba.conf"
|
SMB_USERCONF="/storage/.config/samba.conf"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user