From patchwork Mon Mar 18 18:43:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7644 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) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Tz3dp5dHXz3wmD for ; Mon, 18 Mar 2024 18:43:26 +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 4Tz3dk522bz10q; Mon, 18 Mar 2024 18:43:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Tz3dk2n3Lz32sh; 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) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Tz3dh23shz32sc 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 4Tz3dg19X0zj1; Mon, 18 Mar 2024 18:43:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1710787399; 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; bh=95Eri90MoldZ1lRJFDq725Mxw9YLOIu9hSG79PGUi2E=; b=0vlL+gfdYInN02Nd9qAQDVn97pVfTEF/eCoVzkXDZhYyvifXjicLEiy/M4M539zZznHzIa VNP70KnvNUHF4tBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1710787399; 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; bh=95Eri90MoldZ1lRJFDq725Mxw9YLOIu9hSG79PGUi2E=; b=pqu6xbqVjEmUg5+0kiH86ToIEMgRXUeRo+jsFxMhK/avtjNF/jXr1gtDaXxnHFzz+lBPPj 1kPdRpaw1LIHrEzeJjR+LqNBAS+EIjp1guwfu/auaJuWIvlyxQxWL7ZNd00hie5XOYYQe6 9oLqRGE9LsnIPjnKAQo7tToJBU7YQYcEmXESnKJRP2TKUOtwsLQpWS6NjeGM7QUA4wWMXm E1EqCgnUxpRGekIw5NVraKI4r2ASx5CGGEb8/RTj7DuFbVmGZZ/VWxMzT3K1/R8/77siCC s7RrSZseS1/yG2ymgHff7Zhc/yKsbdX0eXIjjzcSvY3fv5K/NkjPKzBDkV8v9w== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/4] samba: Integrate wsdd initscript into samba initscript - bug#13445 Date: Mon, 18 Mar 2024 19:43:11 +0100 Message-ID: <20240318184314.3683-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 3RQOJYPLKWXM7ZDJQL7LIECEERKZ7X6J X-Message-ID-Hash: 3RQOJYPLKWXM7ZDJQL7LIECEERKZ7X6J 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: - This integrates the wsdd initscript functions into the samba initscript. When samba is started or stopped or the status requested then wsdd is part of that process. - Tested in my vm testbed and confirmed to work for start, stop and status. Confirmed pid's shown with status command are in the appropriate pid files. Fixes: bug#13445 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- src/initscripts/packages/samba | 40 +++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/initscripts/packages/samba b/src/initscripts/packages/samba index 93f14cd29..3945f4384 100644 --- a/src/initscripts/packages/samba +++ b/src/initscripts/packages/samba @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# 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 # @@ -30,6 +30,8 @@ function fix_permissions() { mkdir -p /var/run/samba/{nmbd,ncalrpc,winbindd} } +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + case "$1" in start) fix_permissions @@ -42,6 +44,35 @@ case "$1" in boot_mesg "Starting winbind..." loadproc /usr/sbin/winbindd + + # Arguments for wsdd command + 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 + + PIDFILE="/var/run/wsdd.pid" + boot_mesg "Starting Web Service Discovery Host Daemon..." + loadproc -b -p "${PIDFILE}" /usr/bin/wsdd "${ARGS[@]}" ;; stop) @@ -53,6 +84,10 @@ case "$1" in boot_mesg "Stopping winbind..." killproc /usr/sbin/winbindd + + PIDFILE="/var/run/wsdd.pid" + boot_mesg "Stopping Web Service Discovery Host Daemon..." + killproc -p "${PIDFILE}" /usr/bin/wsdd ;; reload) @@ -76,6 +111,9 @@ case "$1" in statusproc /usr/sbin/nmbd statusproc /usr/sbin/smbd statusproc /usr/sbin/winbindd + + PIDFILE="/var/run/wsdd.pid" + statusproc /usr/bin/wsdd ;; *) 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 - From patchwork Mon Mar 18 18:43:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7646 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 4Tz3dr1M9Rz3wmD for ; Mon, 18 Mar 2024 18:43:28 +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 4Tz3dl1ghpzFLs; 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 4Tz3dk5WF5z32sv; 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 4Tz3dh3fKkz32sc 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 4Tz3dh29xbzj1; Mon, 18 Mar 2024 18:43:20 +0000 (UTC) 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=gaaMv2GhUAAJY1foQrp+130VPpf5a8jUHgyceta6yAc=; b=b0t/381l4PWIyMKFYgTCsePwGmkahOq8QijhtxyoBmFd+lrlP+ITRNTv0RlIxultTJRbKE 7GCCyHW0hp4y6cDA== 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=gaaMv2GhUAAJY1foQrp+130VPpf5a8jUHgyceta6yAc=; b=CaS+0TZ6+Y/Yvq+7LQZqD9CPjqPhJfj7z/P5X9xgXfaIIRnNc7K177AYDcdPdZ0Vz3Ibfl 6/gjnjbqrNQ5EsSAmDHfTVMvQtYCdLlAvdcArxGSCX+EvdbNfaQSgPZlZt8MTW7m0x1Nq/ yqweFBdjq5lb3sqAzKhEznTokPnYkX38NJ2FAH5FohpqeLDW5exeQXhhZxxJ5qBGMlBOp6 1dx5oa3jePiIMnEpBQI/LBen8oxVNZe2LYtq5jfy2DEH7Cd5ul3ZfzFx7DUuzABSTL5gtf O9Ac4laqGDAAghch6CbQX++K9Z4MC+NNFPUz+vUT8+ScjcbTRYQRn/MTpog0Eg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/4] wsdd: Update of lfs file - fixes bug#13445 Date: Mon, 18 Mar 2024 19:43:13 +0100 Message-ID: <20240318184314.3683-3-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: FP4AEYGP354THNA7ROZUHUDFCTMSSM4H X-Message-ID-Hash: FP4AEYGP354THNA7ROZUHUDFCTMSSM4H 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: - Removal of services line as wsdd will now be started by the samba option in the addon services wui page - Removal of installing separate wsdd initscript as it is nowe integrated into the samba initscript. Fixes: bug#13445 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- lfs/wsdd | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lfs/wsdd b/lfs/wsdd index aa65e47ef..bf2a1a032 100644 --- a/lfs/wsdd +++ b/lfs/wsdd @@ -33,11 +33,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wsdd -PAK_VER = 1 +PAK_VER = 2 DEPS = -SERVICES = wsdd +SERVICES = ############################################################################### # Top-level Rules @@ -82,8 +82,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && cp src/wsdd.py /usr/bin/wsdd - #install initscripts - $(call INSTALL_INITSCRIPTS,$(SERVICES)) - @rm -rf $(DIR_APP) @$(POSTBUILD) From patchwork Mon Mar 18 18:43:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7647 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 4Tz3dr5TZYz3xDk for ; Mon, 18 Mar 2024 18:43:28 +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 4Tz3dn0Dj7zFLP; Mon, 18 Mar 2024 18:43:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Tz3dm6rrzz32sg; Mon, 18 Mar 2024 18:43:24 +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 4Tz3dh577zz32sc 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 4Tz3dh3djlz10q; Mon, 18 Mar 2024 18:43:20 +0000 (UTC) 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=U2ofIDugx/GFR8sVDfUEbaPNikAXaMIRIxfhjWJybs8=; b=1o6ODJr8kJmXzoTwUlDUejusuWP0OGHrGOzJE0GGPWwaD/DxI7tFHnQsHTexi6UkCvs/cc oyVzire1JMOFIYCQ== 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=U2ofIDugx/GFR8sVDfUEbaPNikAXaMIRIxfhjWJybs8=; b=vYlefQd5YFUqvjj9qk+Tr5WkkLkGFIswEhSl9Tf/k3a3wugZwrAcfphCnsfmc9KLlnQ1rh Hmeyfxuvg/hXnXNHTla1HoFKoSE/OyPffiTkWY/B4xd22RWDhR/64KxKXGRNZTM9+SgLdM Jv/dPToErMM3QEK6DeMh0NMaFQa4SlzF2XgA4Ry5P/XQmr+laMgKIGp0bbKwOb+KKDN8yJ EYX8QS/R9dsM1S+tjp4t3Pn6VoOFS2x83Jp3Ac4cWyDX/kaA9JdOCeFFD094efwBjj4uWS 8afQBH6upMrb8A531VkPEGSrYHy5RbM5PLQffhEaFQ58ENtfo+xs1dm8brRPWg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 4/4] wsdd: Update install and uninstall pak files Date: Mon, 18 Mar 2024 19:43:14 +0100 Message-ID: <20240318184314.3683-4-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: JXX5IE2AALWIHYST4XWTTNRH34UDEELE X-Message-ID-Hash: JXX5IE2AALWIHYST4XWTTNRH34UDEELE 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: - As wsdd is now started by samba when it is started then the wsdd install and uninstall paks no longer need to create the symlinks for starting and stopping wsdd and no longer need the start_service and stop_service commands in the paks. Fixes: bug#13445 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- src/paks/wsdd/install.sh | 7 +------ src/paks/wsdd/uninstall.sh | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/paks/wsdd/install.sh b/src/paks/wsdd/install.sh index 181b84eb9..12fde4802 100644 --- a/src/paks/wsdd/install.sh +++ b/src/paks/wsdd/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh # If the wsdd user does not exist yet, then create it and add to wsdd group. -if ! getent user wsdd >/dev/null; then +if ! getent passwd wsdd >/dev/null; then useradd -r -U -d / -s /bin/false -c "wsdd user" wsdd usermod -a -G wsdd wsdd fi @@ -32,9 +32,4 @@ fi extract_files restore_backup ${NAME} -# Create startlinks -ln -sf ../init.d/wsdd /etc/rc.d/rc0.d/K35wsdd -ln -sf ../init.d/wsdd /etc/rc.d/rc3.d/S65wsdd -ln -sf ../init.d/wsdd /etc/rc.d/rc6.d/K35wsdd -start_service ${NAME} exit 0 diff --git a/src/paks/wsdd/uninstall.sh b/src/paks/wsdd/uninstall.sh index 4c52ee281..9dc5202f4 100644 --- a/src/paks/wsdd/uninstall.sh +++ b/src/paks/wsdd/uninstall.sh @@ -22,9 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -stop_service ${NAME} make_backup ${NAME} remove_files -# Remove all start links. -rm -rf /etc/rc.d/rc*.d/*wsdd exit 0