gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ivan Kozik
2022-05-05 20:09:00 +00:00
parent f18cc2cf02
commit 59a76614f3
11 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml
View File

@@ -248,7 +248,7 @@ $ nix-env -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' -I nixos-co
(since your Nix install was probably single user): (since your Nix install was probably single user):
</para> </para>
<programlisting> <programlisting>
$ sudo chown -R 0.0 /nix $ sudo chown -R 0:0 /nix
</programlisting> </programlisting>
</listitem> </listitem>
<listitem> <listitem>

2
nixos/doc/manual/installation/installing-from-other-distro.section.md
View File

@@ -177,7 +177,7 @@ The first steps to all these are the same:
was probably single user): was probably single user):
```ShellSession ```ShellSession
$ sudo chown -R 0.0 /nix $ sudo chown -R 0:0 /nix
``` ```
1. Set up the `/etc/NIXOS` and `/etc/NIXOS_LUSTRATE` files: 1. Set up the `/etc/NIXOS` and `/etc/NIXOS_LUSTRATE` files:

8
nixos/modules/services/continuous-integration/hydra/default.nix
View File

@@ -300,17 +300,17 @@ in
}; };
preStart = '' preStart = ''
mkdir -p ${baseDir} mkdir -p ${baseDir}
chown hydra.hydra ${baseDir} chown hydra:hydra ${baseDir}
chmod 0750 ${baseDir} chmod 0750 ${baseDir}
ln -sf ${hydraConf} ${baseDir}/hydra.conf ln -sf ${hydraConf} ${baseDir}/hydra.conf
mkdir -m 0700 -p ${baseDir}/www mkdir -m 0700 -p ${baseDir}/www
chown hydra-www.hydra ${baseDir}/www chown hydra-www:hydra ${baseDir}/www
mkdir -m 0700 -p ${baseDir}/queue-runner mkdir -m 0700 -p ${baseDir}/queue-runner
mkdir -m 0750 -p ${baseDir}/build-logs mkdir -m 0750 -p ${baseDir}/build-logs
chown hydra-queue-runner.hydra ${baseDir}/queue-runner ${baseDir}/build-logs chown hydra-queue-runner:hydra ${baseDir}/queue-runner ${baseDir}/build-logs
${optionalString haveLocalDB '' ${optionalString haveLocalDB ''
if ! [ -e ${baseDir}/.db-created ]; then if ! [ -e ${baseDir}/.db-created ]; then
@@ -338,7 +338,7 @@ in
rmdir /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots rmdir /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots
fi fi
chown hydra.hydra ${cfg.gcRootsDir} chown hydra:hydra ${cfg.gcRootsDir}
chmod 2775 ${cfg.gcRootsDir} chmod 2775 ${cfg.gcRootsDir}
''; '';
serviceConfig.ExecStart = "${hydra-package}/bin/hydra-init"; serviceConfig.ExecStart = "${hydra-package}/bin/hydra-init";

4
nixos/modules/services/networking/gateone.nix
View File

@@ -36,11 +36,11 @@ config = mkIf cfg.enable {
preStart = '' preStart = ''
if [ ! -d ${cfg.settingsDir} ] ; then if [ ! -d ${cfg.settingsDir} ] ; then
mkdir -m 0750 -p ${cfg.settingsDir} mkdir -m 0750 -p ${cfg.settingsDir}
chown -R gateone.gateone ${cfg.settingsDir} chown -R gateone:gateone ${cfg.settingsDir}
fi fi
if [ ! -d ${cfg.pidDir} ] ; then if [ ! -d ${cfg.pidDir} ] ; then
mkdir -m 0750 -p ${cfg.pidDir} mkdir -m 0750 -p ${cfg.pidDir}
chown -R gateone.gateone ${cfg.pidDir} chown -R gateone:gateone ${cfg.pidDir}
fi fi
''; '';
#unitConfig.RequiresMountsFor = "${cfg.settingsDir}"; #unitConfig.RequiresMountsFor = "${cfg.settingsDir}";

2
nixos/modules/services/networking/ircd-hybrid/ircd.conf
View File

@@ -98,7 +98,7 @@ serverinfo {
* *
* openssl genrsa -out rsa.key 2048 * openssl genrsa -out rsa.key 2048
* openssl rsa -in rsa.key -pubout -out rsa.pub * openssl rsa -in rsa.key -pubout -out rsa.pub
* chown <ircd-user>.<ircd.group> rsa.key rsa.pub * chown <ircd-user>:<ircd.group> rsa.key rsa.pub
* chmod 0600 rsa.key * chmod 0600 rsa.key
* chmod 0644 rsa.pub * chmod 0644 rsa.pub
*/ */

2
nixos/modules/services/networking/pptpd.nix
View File

@@ -108,7 +108,7 @@ with lib;
#username pptpd password * #username pptpd password *
EOF EOF
chown root.root "$secrets" chown root:root "$secrets"
chmod 600 "$secrets" chmod 600 "$secrets"
''; '';

2
nixos/modules/services/networking/prayer.nix
View File

@@ -82,7 +82,7 @@ in
serviceConfig.Type = "forking"; serviceConfig.Type = "forking";
preStart = '' preStart = ''
mkdir -m 0755 -p ${stateDir} mkdir -m 0755 -p ${stateDir}
chown ${prayerUser}.${prayerGroup} ${stateDir} chown ${prayerUser}:${prayerGroup} ${stateDir}
''; '';
script = "${prayer}/sbin/prayer --config-file=${prayerCfg}"; script = "${prayer}/sbin/prayer --config-file=${prayerCfg}";
}; };

4
nixos/modules/services/networking/tinc.nix
View File

@@ -383,9 +383,9 @@ in
}; };
preStart = '' preStart = ''
mkdir -p /etc/tinc/${network}/hosts mkdir -p /etc/tinc/${network}/hosts
chown tinc.${network} /etc/tinc/${network}/hosts chown tinc:${network} /etc/tinc/${network}/hosts
mkdir -p /etc/tinc/${network}/invitations mkdir -p /etc/tinc/${network}/invitations
chown tinc.${network} /etc/tinc/${network}/invitations chown tinc:${network} /etc/tinc/${network}/invitations
# Determine how we should generate our keys # Determine how we should generate our keys
if type tinc >/dev/null 2>&1; then if type tinc >/dev/null 2>&1; then

6
nixos/modules/services/networking/xl2tpd.nix
View File

@@ -116,18 +116,18 @@ with lib;
#username xl2tpd password * #username xl2tpd password *
EOF EOF
chown root.root ppp/chap-secrets chown root:root ppp/chap-secrets
chmod 600 ppp/chap-secrets chmod 600 ppp/chap-secrets
# The documentation says this file should be present but doesn't explain why and things work even if not there: # The documentation says this file should be present but doesn't explain why and things work even if not there:
[ -f l2tp-secrets ] || (echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) > l2tp-secrets [ -f l2tp-secrets ] || (echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) > l2tp-secrets
chown root.root l2tp-secrets chown root:root l2tp-secrets
chmod 600 l2tp-secrets chmod 600 l2tp-secrets
popd > /dev/null popd > /dev/null
mkdir -p /run/xl2tpd mkdir -p /run/xl2tpd
chown root.root /run/xl2tpd chown root:root /run/xl2tpd
chmod 700 /run/xl2tpd chmod 700 /run/xl2tpd
''; '';

8
nixos/modules/services/web-apps/restya-board.nix
View File

@@ -294,7 +294,7 @@ in
ln -sf "${cfg.dataDir}/client/img" "${runDir}/client/img" ln -sf "${cfg.dataDir}/client/img" "${runDir}/client/img"
chmod g+w "${runDir}/tmp/cache" chmod g+w "${runDir}/tmp/cache"
chown -R "${cfg.user}"."${cfg.group}" "${runDir}" chown -R "${cfg.user}":"${cfg.group}" "${runDir}"
mkdir -m 0750 -p "${cfg.dataDir}" mkdir -m 0750 -p "${cfg.dataDir}"
@@ -302,9 +302,9 @@ in
mkdir -m 0750 -p "${cfg.dataDir}/client/img" mkdir -m 0750 -p "${cfg.dataDir}/client/img"
cp -r "${pkgs.restya-board}/media/"* "${cfg.dataDir}/media" cp -r "${pkgs.restya-board}/media/"* "${cfg.dataDir}/media"
cp -r "${pkgs.restya-board}/client/img/"* "${cfg.dataDir}/client/img" cp -r "${pkgs.restya-board}/client/img/"* "${cfg.dataDir}/client/img"
chown "${cfg.user}"."${cfg.group}" "${cfg.dataDir}" chown "${cfg.user}":"${cfg.group}" "${cfg.dataDir}"
chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/media" chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/media"
chown -R "${cfg.user}"."${cfg.group}" "${cfg.dataDir}/client/img" chown -R "${cfg.user}":"${cfg.group}" "${cfg.dataDir}/client/img"
${optionalString (cfg.database.host == null) '' ${optionalString (cfg.database.host == null) ''
if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then if ! [ -e "${cfg.dataDir}/.db-initialized" ]; then

2
nixos/tests/virtualbox.nix
View File

@@ -222,7 +222,7 @@ let
machine.execute(ru("VBoxManage controlvm ${name} poweroff")) machine.execute(ru("VBoxManage controlvm ${name} poweroff"))
machine.succeed("rm -rf ${sharePath}") machine.succeed("rm -rf ${sharePath}")
machine.succeed("mkdir -p ${sharePath}") machine.succeed("mkdir -p ${sharePath}")
machine.succeed("chown alice.users ${sharePath}") machine.succeed("chown alice:users ${sharePath}")
def create_vm_${name}(): def create_vm_${name}():