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