From patchwork Wed Jul 21 14:41:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4551 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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GVJFg1skkz3xHT for ; Wed, 21 Jul 2021 14:42:15 +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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GVJFb6yLZz1wg; Wed, 21 Jul 2021 14:42:11 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GVJFb1Bl0z2yyH; Wed, 21 Jul 2021 14:42:11 +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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GVJFZ2bmfz2yj1 for ; Wed, 21 Jul 2021 14:42:10 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GVJFY4pcMzZ6; Wed, 21 Jul 2021 14:42:09 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1626878529; 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=4zThifPz9JT2BZg4BN0Gp7UZBcobt6vKbz0k+J2pfiI=; b=HBoQVVfv3XrJA9PMdxK+tBj1j8oLQ3YwuxMooq7hO5wnQUv/idQHQkq0usvNK3EwI6Wnze 8bGtnolZFEpU1KBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1626878529; 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=4zThifPz9JT2BZg4BN0Gp7UZBcobt6vKbz0k+J2pfiI=; b=DRDu25Gfj2PFIZX2svMbYoiNQ+L138dg33UkjQssQPmDr9+vIKpl9aLfZVbQvp+pKNFkrU YDDUZJoUB5iupZ5ys9Lmr1KN3jfSPVq5WClIU56iSDKP/DR1sOrfTKB9Gs/dXfprkbutYW qE5MBP2qutNWFQxB1XPN5xlhk+Hor9JIV7Et2fajLypI0Q0HjTvksxsVUAthoRZNQ1fCqw 1D2hgQosNqabI55rc24WQqx2mnGIX8Hfx4iV8wqbgQtzRGsuSKxuDir7e1pRTddj5Cn7Rj dAZFZ1wdli8cpibHnSMbsx2WRDHF2uIxViLpeM/YVOEiM3BlcL+R5VW0k4g52A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/3] dbus: Add reload to initscript Date: Wed, 21 Jul 2021 14:41:56 +0000 Message-Id: <20210721144158.25747-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/dbus | 2 +- src/initscripts/packages/messagebus | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lfs/dbus b/lfs/dbus index 06431b4b5..09f4a541b 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dbus -PAK_VER = 3 +PAK_VER = 4 DEPS = diff --git a/src/initscripts/packages/messagebus b/src/initscripts/packages/messagebus index fc719c99a..3ea80bc92 100644 --- a/src/initscripts/packages/messagebus +++ b/src/initscripts/packages/messagebus @@ -32,7 +32,12 @@ case "$1" in $0 start ;; - status) + reload) + boot_mesg "Reloading the D-Bus Messagebus Daemon..." + reloadproc /usr/bin/dbus-daemon + ;; + + status) statusproc -p $pidfile /usr/bin/dbus-daemon ;; From patchwork Wed Jul 21 14:41:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4550 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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GVJFg1f8Xz3xGp for ; Wed, 21 Jul 2021 14:42:15 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GVJFc0Yz4z2B7; Wed, 21 Jul 2021 14:42:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GVJFb1rl5z2yyV; Wed, 21 Jul 2021 14:42:11 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GVJFZ2yP8z2yk8 for ; Wed, 21 Jul 2021 14:42:10 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GVJFZ1K3bz1KD; Wed, 21 Jul 2021 14:42:10 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1626878530; 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=3w+S5npkhwJEnxtc5Abd54vV2NyEh/VvvEM0xx+1PGc=; b=0UjzZpMRtA1qFe+NQL706auZlAHBPYG+y5hbiZWHjaQOfOhXwFLO3PddNsb/ZXKVllJ8+1 +QjPTmEV3BA6w7DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1626878530; 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=3w+S5npkhwJEnxtc5Abd54vV2NyEh/VvvEM0xx+1PGc=; b=nCLia+CT52oKEkcdzMGabvwNPl5tEmQSlmJZoZB9c1DJNEWGSgxb6xtkl+30oPUjLCfGSx 85aTl78cHx/RWWKyGn2XzGwh+9MEqqm3Y27MofLKD4RUQVwQpHLMwYrcK1KznrG02RJAfA 5nQdTZm/TSzG4nMNmy9eYRgNExCIJyOhsKbMgeEqbY1qIeWLeX1ybxNB2Swm25rnJVHKGA 6owsbu50wmg3KNuM0WMPAqQmxf/+VCwLBFnR0h7lyJJY4c8rndCP1xR3Qd2qwPgP/osKjL OGVgUa7W56OdNNiJVmHKlEoqubI6C/imMhH2UGb9J86IxFZ3JppHSrYMclgbqg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/3] avahi: Reload dbus to load/unload policy Date: Wed, 21 Jul 2021 14:41:57 +0000 Message-Id: <20210721144158.25747-2-michael.tremer@ipfire.org> In-Reply-To: <20210721144158.25747-1-michael.tremer@ipfire.org> References: <20210721144158.25747-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/avahi | 2 +- src/paks/avahi/install.sh | 4 ++++ src/paks/avahi/uninstall.sh | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lfs/avahi b/lfs/avahi index 4b2b79ded..ae166a88c 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = avahi -PAK_VER = 7 +PAK_VER = 8 DEPS = dbus libdaemon diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh index cb0266bae..9ec3050a1 100644 --- a/src/paks/avahi/install.sh +++ b/src/paks/avahi/install.sh @@ -34,4 +34,8 @@ ln -svf ../init.d/avahi /etc/rc.d/rc3.d/S65avahi ln -svf ../init.d/avahi /etc/rc.d/rc0.d/K35avahi ln -svf ../init.d/avahi /etc/rc.d/rc6.d/K35avahi restore_backup ${NAME} + +# Reload dbus to load avahi configuration +/etc/init.d/messagebus reload + start_service --background ${NAME} diff --git a/src/paks/avahi/uninstall.sh b/src/paks/avahi/uninstall.sh index 1c8e67c9a..1a5d7a620 100644 --- a/src/paks/avahi/uninstall.sh +++ b/src/paks/avahi/uninstall.sh @@ -26,3 +26,4 @@ stop_service ${NAME} make_backup ${NAME} remove_files rm -rf /etc/rc.d/rc*.d/*avahi +/etc/init.d/messagebus reload From patchwork Wed Jul 21 14:41:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4552 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GVJFg22n7z3xHs for ; Wed, 21 Jul 2021 14:42:15 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GVJFc287pz2Lh; Wed, 21 Jul 2021 14:42:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GVJFb2W6fz300q; Wed, 21 Jul 2021 14:42:11 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GVJFZ3H4Rz2yqg for ; Wed, 21 Jul 2021 14:42:10 +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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GVJFZ28Drz1Ts; Wed, 21 Jul 2021 14:42:10 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1626878530; 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=Pl5mcdf1wffYnsbmMlbpWs9Y3f3CSZe54ZAWjpMDQzI=; b=k95mLncQr38iTloql7Zbd0sV+nopyHi43uSbwM8xfW3NNOSgJv6ANTKWE6aYtJA6+Dy4iZ arRyg1DxmmMco3BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1626878530; 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=Pl5mcdf1wffYnsbmMlbpWs9Y3f3CSZe54ZAWjpMDQzI=; b=is65HeI8HoKJwGtN9CBAlzAhdwq2fE7Gmv6PXC1XryQP4QFR9F3TyrQw7IPXiYJVSMc5kH yPKEgHvUYEKVn6j7iIUin4F4GSJLDSAUCqfg06y0s3LwUlGcSzIlBPoavRJw7O36JLfJD1 sEYyyZgkfj71+dauWT4XjQQmVfO/A76zGpgMVCvocBgQKDrvfri9dnuZuFLsN/pgexPe5w XLUv0Ixx1EG8uyV36hdrCw4BGSMixAJjby7YnoqyEBFKeGVBfpEtPhK9Jt8UcqQEigM9nP 8cjaoVM6Dc7ZynkMO2T+/JPxVVyvul6oiBZO4uNUGwbbiLxjj/hLNCMHt39FHA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/3] cups: Reload dbus to load/unload policy Date: Wed, 21 Jul 2021 14:41:58 +0000 Message-Id: <20210721144158.25747-3-michael.tremer@ipfire.org> In-Reply-To: <20210721144158.25747-1-michael.tremer@ipfire.org> References: <20210721144158.25747-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- src/paks/cups/install.sh | 1 + src/paks/cups/uninstall.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh index 38715f9e8..b3f0f1368 100644 --- a/src/paks/cups/install.sh +++ b/src/paks/cups/install.sh @@ -23,6 +23,7 @@ # . /opt/pakfire/lib/functions.sh extract_files +/etc/init.d/messagebus reload start_service --delay 300 --background ${NAME} ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups diff --git a/src/paks/cups/uninstall.sh b/src/paks/cups/uninstall.sh index 744c2062d..01b13de76 100644 --- a/src/paks/cups/uninstall.sh +++ b/src/paks/cups/uninstall.sh @@ -25,3 +25,4 @@ stop_service ${NAME} remove_files rm -rf /etc/rc.d/rc*.d/*cups +/etc/init.d/messagebus reload