From patchwork Mon Mar 18 18:43:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7645 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Tz3dq5TXbz3xDX for ; Mon, 18 Mar 2024 18:43:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Tz3dl1C5WzFLn; Mon, 18 Mar 2024 18:43:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Tz3dk4Bc4z32sr; Mon, 18 Mar 2024 18:43:22 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Tz3dh2XcRz32sc for ; Mon, 18 Mar 2024 18:43:20 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Tz3dg6YZ0z10q; Mon, 18 Mar 2024 18:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1710787400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UWSDmGNzMF2LFgPZKmpq5csW/PkhSXtva9yJ4ZapgjY=; b=hn4YVhZyKdAnu9y00P4egEVUoP1KDN3XuQsKHSusxj3KNkHIp9hFuJoD6JSicnD0AzRPgK VqFZ/mG1h3l3awEi6yVue5MhAlk8wAeAXzMCDOu02F2NpOJFlMPz5QJ668LVj9Or8ghaUc jGCOzCAmuyKR9zASRjspFlFZTuUfsjR/c2QkAHR0sTr4bRgkLdJfgrBr0yJ9Q6iBAcdKHI 7A6NvnJAa5ecVvfvLBZJHpaB9r/1ABTl9E7w/+Cch61XkYVBFGY1Q4hsjDtx6EnORCFS7V OWM50J4rc5pL5IYKS7C0xO0+PJcCiIxfbQPGsGpvUm0JKSbRSKL98wPU7nyi0w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1710787400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UWSDmGNzMF2LFgPZKmpq5csW/PkhSXtva9yJ4ZapgjY=; b=CgrsYIoLcGhATgAhc9mVEvrplRZll+neWhsTFLPdrHMrfTrmFglajLoHh//kj+Dad5tQ4O 46xR1S+b+sCQsnCg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/4] wsdd: remove wsdd initscript as now covered by samba - fixes bug#13445 Date: Mon, 18 Mar 2024 19:43:12 +0100 Message-ID: <20240318184314.3683-2-adolf.belka@ipfire.org> In-Reply-To: <20240318184314.3683-1-adolf.belka@ipfire.org> References: <20240318184314.3683-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: FBOVEYPF6ZSW7CEVL5TJEHP5DKU7U2U3 X-Message-ID-Hash: FBOVEYPF6ZSW7CEVL5TJEHP5DKU7U2U3 X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Fixes: bug#13445 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- src/initscripts/packages/wsdd | 78 ----------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 src/initscripts/packages/wsdd diff --git a/src/initscripts/packages/wsdd b/src/initscripts/packages/wsdd deleted file mode 100644 index 68e8f3de0..000000000 --- a/src/initscripts/packages/wsdd +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -. /etc/sysconfig/rc -. $rc_functions - -eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - -PIDFILE="/var/run/wsdd.pid" - -case "$1" in - start) - ARGS=( - # Launch as non-privileged user - "--user" "wsdd:wsdd" - - # Launch in chroot - "--chroot" "/var/run/wsdd" - - # Only use IPv4 - "--ipv4only" - - # Configure the workgroup - "--workgroup" "$(testparm -s --parameter-name workgroup 2>/dev/null)" - ) - - # Conditionally add the GREEN/BLUE interface - for intf in GREEN_DEV BLUE_DEV; do - if [ -n "${!intf}" ]; then - ARGS+=( "--interface" "${!intf}" ) - fi - done - - # Create chroot directory for wsdd - mkdir -p /var/run/wsdd - - boot_mesg "Starting Web Service Discovery Host Daemon..." - loadproc -b -p "${PIDFILE}" /usr/bin/wsdd "${ARGS[@]}" - ;; - - stop) - boot_mesg "Stopping Web Service Discovery Host Daemon..." - killproc -p "${PIDFILE}" /usr/bin/wsdd - ;; - - status) - statusproc /usr/bin/wsdd - ;; - - restart) - $0 stop - $0 start - ;; - - *) - echo "Usage: $0 (start|stop|status|restart)" - exit 1 - ;; -esac -