chown: Replace . with : on all shipped scripts

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 <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/frr b/lfs/frr
index 577698cd681c69857a4cabe79b390105484319fc..95fbdf0f19c50ceba5d4f0a3045c12849a7dfdf1 100644 (file)
--- 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 dd593ecf1bd4372d18332eccdbbf46a40fcc9c92..e33d9db2d232c33c900fe0213461597a71a381b1 100644 (file)
--- 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 f14f4eb57894180614e69beaae0e639e70df4e24..7b3371ac3a3efec3bc2cc37789d3a54187391c92 100644 (file)
--- 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 7a4422a35320721640b43a9ecb3933b711af9bfa..1a1c2a9fe472b9d4a9c6a466595f118fdfcbe94f 100644 (file)
--- 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 02fdda2a355d1e5c95cc55785cc91a7614e0a966..a0475c2bb3ab9a2acb1c61035030b65797f71ed9 100644 (file)
--- 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 4f5148c3e2447a5772b04e2d2dee0bef13a6ebc3..132ee9bb8820029a8ace2b4ba70ee6b913d8172d 100644 (file)
--- 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 312014b74c2bd7f23cdab0f4198337d1fbc1f8db..8ea465e509aa6978351dc0b699e914a98b8ff0bf 100644 (file)
--- 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 22cf2f7aaf073109e069abc06a50d44750844e7b..54cf4d3e71d7a7aafdf71a08c112f43a16fa505f 100644 (file)
--- 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 055968ef0c4aeebf76b1df34c85a825c55864899..224cc4fe41b13906bd9d5783dddf70d87672806d 100644 (file)
--- 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 d1cbb2547ec13449a504e952706c387cb86e0b80..af9332c49550318db73c63560dff30896bc9b6c1 100644 (file)
--- 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 b7cb30b7c92e43277ea00b0ceb9e13cb262532da..d457343342a8c84aa0b1f60e6106cb79b0168ac5 100644 (file)
--- 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 8de6eec5cbe9d34596e386c0de85b867e7549c1d..fb32146e437cafab0c71658869d893e5785641de 100644 (file)
--- 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 f1d0338c23e728e85f6f1587dd013434a10954dc..31f59b140a974b5f9cd37e78036a0fb20c15bd6d 100644 (file)
--- 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);
        }