From ee9b463d05a6f367f5902e54bc38d2a5c823d9c1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 15 Aug 2013 21:12:07 +0300 Subject: [PATCH 1/2] init: always spawn debugshell on fatal errors --- packages/initramfs/sysutils/busybox-initramfs/scripts/init | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index 04104c6f09..d897d08da8 100755 --- 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() { From fc443ca8a00d11628e1c1a422b7c430cd9898a72 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 16 Aug 2013 23:05:08 +0300 Subject: [PATCH 2/2] samba: fix startup with no network this fixes multiple issues: - no need to wait for network in initscript - smbd can correctly bind on 0.0.0.0:445 instead of ::445 - iface ifconf is fine on target. nmbd waits and should bind on every new interface --- packages/network/samba/package.mk | 4 ++-- packages/network/samba/scripts/52_samba | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 95d22882da..eedd0579b7 100644 --- 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 \ diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba index 47c8a06edb..1f844ecaff 100644 --- 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"