Merge pull request #171703 from ivan/chown-colon

treewide: chown user:group instead of user.group to fix warnings from coreutils 9.1

authored by Rick van Schijndel and committed by GitHub 32bebf42 8c41f43e

+23 -23
+1 -1
nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml
··· 248 248 (since your Nix install was probably single user): 249 249 </para> 250 250 <programlisting> 251 - $ sudo chown -R 0.0 /nix 251 + $ sudo chown -R 0:0 /nix 252 252 </programlisting> 253 253 </listitem> 254 254 <listitem>
+1 -1
nixos/doc/manual/installation/installing-from-other-distro.section.md
··· 177 177 was probably single user): 178 178 179 179 ```ShellSession 180 - $ sudo chown -R 0.0 /nix 180 + $ sudo chown -R 0:0 /nix 181 181 ``` 182 182 183 183 1. Set up the `/etc/NIXOS` and `/etc/NIXOS_LUSTRATE` files:
+2 -2
nixos/modules/security/wrappers/default.nix
··· 98 98 99 99 # Prevent races 100 100 chmod 0000 "$wrapperDir/${program}" 101 - chown ${owner}.${group} "$wrapperDir/${program}" 101 + chown ${owner}:${group} "$wrapperDir/${program}" 102 102 103 103 # Set desired capabilities on the file plus cap_setpcap so 104 104 # the wrapper program can elevate the capabilities set on ··· 126 126 127 127 # Prevent races 128 128 chmod 0000 "$wrapperDir/${program}" 129 - chown ${owner}.${group} "$wrapperDir/${program}" 129 + chown ${owner}:${group} "$wrapperDir/${program}" 130 130 131 131 chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" "$wrapperDir/${program}" 132 132 '';
+4 -4
nixos/modules/services/continuous-integration/hydra/default.nix
··· 300 300 }; 301 301 preStart = '' 302 302 mkdir -p ${baseDir} 303 - chown hydra.hydra ${baseDir} 303 + chown hydra:hydra ${baseDir} 304 304 chmod 0750 ${baseDir} 305 305 306 306 ln -sf ${hydraConf} ${baseDir}/hydra.conf 307 307 308 308 mkdir -m 0700 -p ${baseDir}/www 309 - chown hydra-www.hydra ${baseDir}/www 309 + chown hydra-www:hydra ${baseDir}/www 310 310 311 311 mkdir -m 0700 -p ${baseDir}/queue-runner 312 312 mkdir -m 0750 -p ${baseDir}/build-logs 313 - chown hydra-queue-runner.hydra ${baseDir}/queue-runner ${baseDir}/build-logs 313 + chown hydra-queue-runner:hydra ${baseDir}/queue-runner ${baseDir}/build-logs 314 314 315 315 ${optionalString haveLocalDB '' 316 316 if ! [ -e ${baseDir}/.db-created ]; then ··· 338 338 rmdir /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots 339 339 fi 340 340 341 - chown hydra.hydra ${cfg.gcRootsDir} 341 + chown hydra:hydra ${cfg.gcRootsDir} 342 342 chmod 2775 ${cfg.gcRootsDir} 343 343 ''; 344 344 serviceConfig.ExecStart = "${hydra-package}/bin/hydra-init";
+2 -2
nixos/modules/services/networking/gateone.nix
··· 36 36 preStart = '' 37 37 if [ ! -d ${cfg.settingsDir} ] ; then 38 38 mkdir -m 0750 -p ${cfg.settingsDir} 39 - chown -R gateone.gateone ${cfg.settingsDir} 39 + chown -R gateone:gateone ${cfg.settingsDir} 40 40 fi 41 41 if [ ! -d ${cfg.pidDir} ] ; then 42 42 mkdir -m 0750 -p ${cfg.pidDir} 43 - chown -R gateone.gateone ${cfg.pidDir} 43 + chown -R gateone:gateone ${cfg.pidDir} 44 44 fi 45 45 ''; 46 46 #unitConfig.RequiresMountsFor = "${cfg.settingsDir}";
+1 -1
nixos/modules/services/networking/ircd-hybrid/ircd.conf
··· 98 98 * 99 99 * openssl genrsa -out rsa.key 2048 100 100 * openssl rsa -in rsa.key -pubout -out rsa.pub 101 - * chown <ircd-user>.<ircd.group> rsa.key rsa.pub 101 + * chown <ircd-user>:<ircd.group> rsa.key rsa.pub 102 102 * chmod 0600 rsa.key 103 103 * chmod 0644 rsa.pub 104 104 */
+1 -1
nixos/modules/services/networking/pptpd.nix
··· 108 108 #username pptpd password * 109 109 EOF 110 110 111 - chown root.root "$secrets" 111 + chown root:root "$secrets" 112 112 chmod 600 "$secrets" 113 113 ''; 114 114
+1 -1
nixos/modules/services/networking/prayer.nix
··· 82 82 serviceConfig.Type = "forking"; 83 83 preStart = '' 84 84 mkdir -m 0755 -p ${stateDir} 85 - chown ${prayerUser}.${prayerGroup} ${stateDir} 85 + chown ${prayerUser}:${prayerGroup} ${stateDir} 86 86 ''; 87 87 script = "${prayer}/sbin/prayer --config-file=${prayerCfg}"; 88 88 };
+2 -2
nixos/modules/services/networking/tinc.nix
··· 383 383 }; 384 384 preStart = '' 385 385 mkdir -p /etc/tinc/${network}/hosts 386 - chown tinc.${network} /etc/tinc/${network}/hosts 386 + chown tinc:${network} /etc/tinc/${network}/hosts 387 387 mkdir -p /etc/tinc/${network}/invitations 388 - chown tinc.${network} /etc/tinc/${network}/invitations 388 + chown tinc:${network} /etc/tinc/${network}/invitations 389 389 390 390 # Determine how we should generate our keys 391 391 if type tinc >/dev/null 2>&1; then
+3 -3
nixos/modules/services/networking/xl2tpd.nix
··· 116 116 #username xl2tpd password * 117 117 EOF 118 118 119 - chown root.root ppp/chap-secrets 119 + chown root:root ppp/chap-secrets 120 120 chmod 600 ppp/chap-secrets 121 121 122 122 # The documentation says this file should be present but doesn't explain why and things work even if not there: 123 123 [ -f l2tp-secrets ] || (echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) > l2tp-secrets 124 - chown root.root l2tp-secrets 124 + chown root:root l2tp-secrets 125 125 chmod 600 l2tp-secrets 126 126 127 127 popd > /dev/null 128 128 129 129 mkdir -p /run/xl2tpd 130 - chown root.root /run/xl2tpd 130 + chown root:root /run/xl2tpd 131 131 chmod 700 /run/xl2tpd 132 132 ''; 133 133
+4 -4
nixos/modules/services/web-apps/restya-board.nix
··· 294 294 ln -sf "${cfg.dataDir}/client/img" "${runDir}/client/img" 295 295 296 296 chmod g+w "${runDir}/tmp/cache" 297 - chown -R "${cfg.user}"."${cfg.group}" "${runDir}" 297 + chown -R "${cfg.user}":"${cfg.group}" "${runDir}" 298 298 299 299 300 300 mkdir -m 0750 -p "${cfg.dataDir}" ··· 302 302 mkdir -m 0750 -p "${cfg.dataDir}/client/img" 303 303 cp -r "${pkgs.restya-board}/media/"* "${cfg.dataDir}/media" 304 304 cp -r "${pkgs.restya-board}/client/img/"* "${cfg.dataDir}/client/img" 305 - chown "${cfg.user}"."${cfg.group}" "${cfg.dataDir}" 306 - chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media" 307 - chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img" 305 + chown "${cfg.user}":"${cfg.group}" "${cfg.dataDir}" 306 + chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/media" 307 + chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/client/img" 308 308 309 309 ${optionalString (cfg.database.host == null) '' 310 310 if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then
+1 -1
nixos/tests/virtualbox.nix
··· 222 222 machine.execute(ru("VBoxManage controlvm ${name} poweroff")) 223 223 machine.succeed("rm -rf ${sharePath}") 224 224 machine.succeed("mkdir -p ${sharePath}") 225 - machine.succeed("chown alice.users ${sharePath}") 225 + machine.succeed("chown alice:users ${sharePath}") 226 226 227 227 228 228 def create_vm_${name}():