Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

2025-07-29 05:36:47 +00:00 · 2013-08-17 14:03:27 +02:00 · 2013-08-17 14:03:27 +02:00 · 25dc1efdce
commit 25dc1efdce
parent 87c3cb6093 fc443ca8a0
3 changed files with 3 additions and 11 deletions
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@ -129,11 +129,7 @@
  # Display fatal error message
  # $1:action which caused error, $2:message
    echo "*** Error in $BOOT_STEP: $1: $2 ***"
-    if [ -z "$DEBUG" ]; then
-      halt
-    else
-      debug_shell
-    fi
+    debug_shell
  }

  break_after() {
--- a/packages/network/samba/package.mk
+++ b/packages/network/samba/package.mk
@ -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 \
--- a/packages/network/samba/scripts/52_samba
+++ b/packages/network/samba/scripts/52_samba
@ -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"