From b568dcd65b2aa6b11cf46dbf8f335f0fe65952d4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 3 Dec 2009 15:24:00 +0100 Subject: [PATCH] samba: - move to network group - wait for for start if connman has started --- packages/{sysutils => network}/samba/build | 0 packages/{sysutils => network}/samba/config/smb.conf | 0 packages/{sysutils => network}/samba/init.d/23_samba | 7 +++++-- packages/{sysutils => network}/samba/install | 0 .../samba/patches/10_debug-no-msg.diff | 0 .../{sysutils => network}/samba/patches/11_error-msg.diff | 0 .../samba/patches/20_crosscompile.diff | 0 .../samba/patches/30_smbtree-diskonly.diff | 0 .../{sysutils => network}/samba/patches/40_oplocks.diff | 0 packages/{sysutils => network}/samba/unpack | 0 packages/{sysutils => network}/samba/url | 0 11 files changed, 5 insertions(+), 2 deletions(-) rename packages/{sysutils => network}/samba/build (100%) rename packages/{sysutils => network}/samba/config/smb.conf (100%) rename packages/{sysutils => network}/samba/init.d/23_samba (64%) rename packages/{sysutils => network}/samba/install (100%) rename packages/{sysutils => network}/samba/patches/10_debug-no-msg.diff (100%) rename packages/{sysutils => network}/samba/patches/11_error-msg.diff (100%) rename packages/{sysutils => network}/samba/patches/20_crosscompile.diff (100%) rename packages/{sysutils => network}/samba/patches/30_smbtree-diskonly.diff (100%) rename packages/{sysutils => network}/samba/patches/40_oplocks.diff (100%) rename packages/{sysutils => network}/samba/unpack (100%) rename packages/{sysutils => network}/samba/url (100%) diff --git a/packages/sysutils/samba/build b/packages/network/samba/build similarity index 100% rename from packages/sysutils/samba/build rename to packages/network/samba/build diff --git a/packages/sysutils/samba/config/smb.conf b/packages/network/samba/config/smb.conf similarity index 100% rename from packages/sysutils/samba/config/smb.conf rename to packages/network/samba/config/smb.conf diff --git a/packages/sysutils/samba/init.d/23_samba b/packages/network/samba/init.d/23_samba similarity index 64% rename from packages/sysutils/samba/init.d/23_samba rename to packages/network/samba/init.d/23_samba index c70f7628c1..1cdd4f6cb4 100755 --- a/packages/sysutils/samba/init.d/23_samba +++ b/packages/network/samba/init.d/23_samba @@ -7,11 +7,14 @@ ( . /etc/sysconfig - progress "Starting Samba server" + wait_for_network + + progress "Starting Samba server" mkdir -p /var/run/samba touch /var/run/samba/secrets.tdb - /usr/bin/smbd > /dev/null 2>&1 & + /usr/bin/smbd > /dev/null 2>&1 + )& exit 0 diff --git a/packages/sysutils/samba/install b/packages/network/samba/install similarity index 100% rename from packages/sysutils/samba/install rename to packages/network/samba/install diff --git a/packages/sysutils/samba/patches/10_debug-no-msg.diff b/packages/network/samba/patches/10_debug-no-msg.diff similarity index 100% rename from packages/sysutils/samba/patches/10_debug-no-msg.diff rename to packages/network/samba/patches/10_debug-no-msg.diff diff --git a/packages/sysutils/samba/patches/11_error-msg.diff b/packages/network/samba/patches/11_error-msg.diff similarity index 100% rename from packages/sysutils/samba/patches/11_error-msg.diff rename to packages/network/samba/patches/11_error-msg.diff diff --git a/packages/sysutils/samba/patches/20_crosscompile.diff b/packages/network/samba/patches/20_crosscompile.diff similarity index 100% rename from packages/sysutils/samba/patches/20_crosscompile.diff rename to packages/network/samba/patches/20_crosscompile.diff diff --git a/packages/sysutils/samba/patches/30_smbtree-diskonly.diff b/packages/network/samba/patches/30_smbtree-diskonly.diff similarity index 100% rename from packages/sysutils/samba/patches/30_smbtree-diskonly.diff rename to packages/network/samba/patches/30_smbtree-diskonly.diff diff --git a/packages/sysutils/samba/patches/40_oplocks.diff b/packages/network/samba/patches/40_oplocks.diff similarity index 100% rename from packages/sysutils/samba/patches/40_oplocks.diff rename to packages/network/samba/patches/40_oplocks.diff diff --git a/packages/sysutils/samba/unpack b/packages/network/samba/unpack similarity index 100% rename from packages/sysutils/samba/unpack rename to packages/network/samba/unpack diff --git a/packages/sysutils/samba/url b/packages/network/samba/url similarity index 100% rename from packages/sysutils/samba/url rename to packages/network/samba/url