From patchwork Thu Oct 17 14:54:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 8194 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 RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4XTrTK47cGz3x2Q for ; Thu, 17 Oct 2024 14:54:29 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4XTrTG4TgXz1rC; Thu, 17 Oct 2024 14:54:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4XTrTG42Fpz33Lc; Thu, 17 Oct 2024 14:54:26 +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 RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4XTrT925XLz33mN for ; Thu, 17 Oct 2024 14:54:21 +0000 (UTC) Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "michael.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4XTrT8725Kz2rc; Thu, 17 Oct 2024 14:54:20 +0000 (UTC) Received: by michael.haj.ipfire.org (Postfix, from userid 0) id 4XTrT83jpmzThmY; Thu, 17 Oct 2024 14:54:20 +0000 (UTC) From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/4] chown: Replace . with : on all shipped scripts Date: Thu, 17 Oct 2024 14:54:16 +0000 Message-Id: <20241017145416.25394-4-michael.tremer@ipfire.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241017145416.25394-1-michael.tremer@ipfire.org> References: <20241017145416.25394-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: TZKJA5Y443G2FIDJ2UGED5MW5M5PGKTS X-Message-ID-Hash: TZKJA5Y443G2FIDJ2UGED5MW5M5PGKTS X-MailFrom: root@michael.haj.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 CC: Michael Tremer 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: I don't like this messy bootup screen that we have with all sorts of warnings that actually don't cause any problems, but make the boot messy and send the wrong message to users. Signed-off-by: Michael Tremer --- lfs/frr | 2 +- lfs/zabbix_agentd | 2 +- src/initscripts/helper/aws-setup | 4 ++-- src/initscripts/helper/azure-setup | 4 ++-- src/initscripts/helper/exoscale-setup | 4 ++-- src/initscripts/helper/gcp-setup | 4 ++-- src/initscripts/helper/oci-setup | 4 ++-- src/initscripts/packages/frr | 4 ++-- src/initscripts/packages/zabbix_agentd | 2 +- src/initscripts/system/cleanfs | 2 +- src/initscripts/system/squid | 2 +- src/misc-progs/openvpnctrl.c | 2 +- src/misc-progs/sshctrl.c | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lfs/frr b/lfs/frr index 577698cd6..95fbdf0f1 100644 --- a/lfs/frr +++ b/lfs/frr @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = frr -PAK_VER = 10 +PAK_VER = 11 DEPS = diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index dd593ecf1..e33d9db2d 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = zabbix_agentd -PAK_VER = 14 +PAK_VER = 15 DEPS = fping diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index f14f4eb57..7b3371ac3 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -110,11 +110,11 @@ import_aws_configuration() { if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then mkdir -p "/home/setup/.ssh" chmod 700 "/home/setup/.ssh" - chown setup.nobody "/home/setup/.ssh" + chown setup:nobody "/home/setup/.ssh" echo "${key}" >> "/home/setup/.ssh/authorized_keys" chmod 600 "/home/setup/.ssh/authorized_keys" - chown setup.nobody "/home/setup/.ssh/authorized_keys" + chown setup:nobody "/home/setup/.ssh/authorized_keys" fi done diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup index 7a4422a35..1a1c2a9fe 100644 --- a/src/initscripts/helper/azure-setup +++ b/src/initscripts/helper/azure-setup @@ -132,12 +132,12 @@ import_azure_configuration() { # Install directory mkdir -p "${dir}" chmod 700 "${dir}" - chown "${user}.nobody" "${dir}" + chown "${user}:nobody" "${dir}" # Install the key echo "${key}" >> "${path}" chmod 600 "${path}" - chown "${user}.nobody" "${path}" + chown "${user}:nobody" "${path}" fi done diff --git a/src/initscripts/helper/exoscale-setup b/src/initscripts/helper/exoscale-setup index 02fdda2a3..a0475c2bb 100644 --- a/src/initscripts/helper/exoscale-setup +++ b/src/initscripts/helper/exoscale-setup @@ -76,11 +76,11 @@ import_exoscale_configuration() { if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then mkdir -p "/home/setup/.ssh" chmod 700 "/home/setup/.ssh" - chown setup.nobody "/home/setup/.ssh" + chown setup:nobody "/home/setup/.ssh" echo "${key}" >> "/home/setup/.ssh/authorized_keys" chmod 600 "/home/setup/.ssh/authorized_keys" - chown setup.nobody "/home/setup/.ssh/authorized_keys" + chown setup:nobody "/home/setup/.ssh/authorized_keys" fi # Import any previous settings for the local interfaces diff --git a/src/initscripts/helper/gcp-setup b/src/initscripts/helper/gcp-setup index 4f5148c3e..132ee9bb8 100644 --- a/src/initscripts/helper/gcp-setup +++ b/src/initscripts/helper/gcp-setup @@ -110,11 +110,11 @@ import_gcp_configuration() { if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then mkdir -p "/home/setup/.ssh" chmod 700 "/home/setup/.ssh" - chown setup.nobody "/home/setup/.ssh" + chown setup:nobody "/home/setup/.ssh" echo "${key}" >> "/home/setup/.ssh/authorized_keys" chmod 600 "/home/setup/.ssh/authorized_keys" - chown setup.nobody "/home/setup/.ssh/authorized_keys" + chown setup:nobody "/home/setup/.ssh/authorized_keys" fi done <<<"$(get instance/attributes/ssh-keys)" diff --git a/src/initscripts/helper/oci-setup b/src/initscripts/helper/oci-setup index 312014b74..8ea465e50 100644 --- a/src/initscripts/helper/oci-setup +++ b/src/initscripts/helper/oci-setup @@ -139,11 +139,11 @@ import_oci_configuration() { if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then mkdir -p "/home/setup/.ssh" chmod 700 "/home/setup/.ssh" - chown setup.nobody "/home/setup/.ssh" + chown setup:nobody "/home/setup/.ssh" echo "${key}" >> "/home/setup/.ssh/authorized_keys" chmod 600 "/home/setup/.ssh/authorized_keys" - chown setup.nobody "/home/setup/.ssh/authorized_keys" + chown setup:nobody "/home/setup/.ssh/authorized_keys" fi done <<<"$(get instance/metadata/ssh_authorized_keys)" diff --git a/src/initscripts/packages/frr b/src/initscripts/packages/frr index 22cf2f7aa..54cf4d3e7 100644 --- a/src/initscripts/packages/frr +++ b/src/initscripts/packages/frr @@ -28,14 +28,14 @@ case "${1}" in start) # Fix permissions of configuration directory if [ -d "/etc/frr" ]; then - chown root.frr /etc/frr + chown root:frr /etc/frr chmod 775 /etc/frr fi for daemon in ${DAEMONS}; do if [ -f "/etc/frr/${daemon}.conf" ]; then # Set permissions - chown frr.frr "/etc/frr/${daemon}.conf" + chown frr:frr "/etc/frr/${daemon}.conf" boot_mesg "Starting FRRouting ${daemon}..." loadproc "/usr/sbin/${daemon}" --daemon diff --git a/src/initscripts/packages/zabbix_agentd b/src/initscripts/packages/zabbix_agentd index 055968ef0..224cc4fe4 100644 --- a/src/initscripts/packages/zabbix_agentd +++ b/src/initscripts/packages/zabbix_agentd @@ -26,7 +26,7 @@ case "${1}" in start) if [ ! -d "/var/run/zabbix" ]; then mkdir -p /var/run/zabbix - chown zabbix.zabbix /var/run/zabbix + chown zabbix:zabbix /var/run/zabbix fi boot_mesg "Starting Zabbix Agent..." diff --git a/src/initscripts/system/cleanfs b/src/initscripts/system/cleanfs index d1cbb2547..af9332c49 100644 --- a/src/initscripts/system/cleanfs +++ b/src/initscripts/system/cleanfs @@ -92,7 +92,7 @@ case "${1}" in fi if [ ! -e /var/lock/time ]; then mkdir -p /var/lock/time - chown nobody.root /var/lock/time + chown nobody:root /var/lock/time fi if [ ! -e /var/run/clamav ]; then mkdir -p /var/run/clamav diff --git a/src/initscripts/system/squid b/src/initscripts/system/squid index b7cb30b7c..d45734334 100644 --- a/src/initscripts/system/squid +++ b/src/initscripts/system/squid @@ -185,7 +185,7 @@ case "$1" in ;; setperms) - chown -R nobody.squid /var/updatecache/ + chown -R nobody:squid /var/updatecache/ ;; *) diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 8de6eec5c..fb32146e4 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -504,7 +504,7 @@ void startDaemon(void) { executeCommand(command); snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --config /var/ipfire/ovpn/server.conf"); executeCommand(command); - snprintf(command, STRING_SIZE-1, "/bin/chown root.nobody /var/run/ovpnserver.log"); + snprintf(command, STRING_SIZE-1, "/bin/chown root:nobody /var/run/ovpnserver.log"); executeCommand(command); snprintf(command, STRING_SIZE-1, "/bin/chmod 644 /var/run/ovpnserver.log"); executeCommand(command); diff --git a/src/misc-progs/sshctrl.c b/src/misc-progs/sshctrl.c index f1d0338c2..31f59b140 100644 --- a/src/misc-progs/sshctrl.c +++ b/src/misc-progs/sshctrl.c @@ -142,7 +142,7 @@ int main(int argc, char *argv[]) sleep(5); unlink("/var/ipfire/remote/enablessh"); safe_system("cat /var/ipfire/remote/settings | sed 's/ENABLE_SSH=on/ENABLE_SSH=off/' > /var/ipfire/remote/settings2 && mv /var/ipfire/remote/settings2 /var/ipfire/remote/settings"); - safe_system("chown nobody.nobody /var/ipfire/remote/settings"); + safe_system("chown nobody:nobody /var/ipfire/remote/settings"); snprintf(command, BUFFER_SIZE-1, "sleep %s && /usr/local/bin/sshctrl &", argv[2]); safe_system(command); }