Author: eelco
Date: Thu May 17 19:43:32 2012
New Revision: 34161
URL: https://nixos.org/websvn/nix/?rev=34161&sc=1
Log:
* Don't use ‘chown user.group’ since that syntax is not officially
supported (you're supposed to say ‘chown user:group’).
Modified:
nixos/trunk/modules/installer/tools/nixos-install.sh
nixos/trunk/modules/security/policykit.nix
nixos/trunk/modules/services/mail/dovecot.nix
nixos/trunk/modules/services/mail/dovecot2.nix
nixos/trunk/modules/services/mail/postfix.nix
nixos/trunk/modules/services/misc/nix-daemon.nix
nixos/trunk/modules/services/monitoring/systemhealth.nix
Modified: nixos/trunk/modules/installer/tools/nixos-install.sh
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-install.sh Thu May 17
19:33:55 2012 (r34160)
+++ nixos/trunk/modules/installer/tools/nixos-install.sh Thu May 17
19:43:32 2012 (r34161)
@@ -80,7 +80,7 @@
$mountPoint/nix/var/log/nix/drvs
mkdir -m 1775 -p $mountPoint/nix/store
-chown root.nixbld $mountPoint/nix/store
+chown root:nixbld $mountPoint/nix/store
# Get the store paths to copy from the references graph.
Modified: nixos/trunk/modules/security/policykit.nix
==============================================================================
--- nixos/trunk/modules/security/policykit.nix Thu May 17 19:33:55 2012
(r34160)
+++ nixos/trunk/modules/security/policykit.nix Thu May 17 19:43:32 2012
(r34161)
@@ -64,15 +64,15 @@
system.activationScripts.policyKit = stringAfter [ "users" ]
''
mkdir -m 0770 -p /var/run/PolicyKit
- chown root.polkituser /var/run/PolicyKit
+ chown root:polkituser /var/run/PolicyKit
mkdir -m 0770 -p /var/lib/PolicyKit
- chown root.polkituser /var/lib/PolicyKit
+ chown root:polkituser /var/lib/PolicyKit
mkdir -p /var/lib/misc
touch /var/lib/misc/PolicyKit.reload
chmod 0664 /var/lib/misc/PolicyKit.reload
- chown polkituser.polkituser /var/lib/misc/PolicyKit.reload
+ chown polkituser:polkituser /var/lib/misc/PolicyKit.reload
'';
};
Modified: nixos/trunk/modules/services/mail/dovecot.nix
==============================================================================
--- nixos/trunk/modules/services/mail/dovecot.nix Thu May 17 19:33:55
2012 (r34160)
+++ nixos/trunk/modules/services/mail/dovecot.nix Thu May 17 19:43:32
2012 (r34161)
@@ -119,7 +119,7 @@
preStart =
''
${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot
/var/run/dovecot/login
- ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group}
/var/run/dovecot
+ ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group}
/var/run/dovecot
'';
exec = "${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}";
Modified: nixos/trunk/modules/services/mail/dovecot2.nix
==============================================================================
--- nixos/trunk/modules/services/mail/dovecot2.nix Thu May 17 19:33:55
2012 (r34160)
+++ nixos/trunk/modules/services/mail/dovecot2.nix Thu May 17 19:43:32
2012 (r34161)
@@ -128,7 +128,7 @@
preStart =
''
${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot2
/var/run/dovecot2/login
- ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group}
/var/run/dovecot2
+ ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group}
/var/run/dovecot2
'';
exec = "${pkgs.dovecot_2_0}/sbin/dovecot -F -c ${confFile}";
Modified: nixos/trunk/modules/services/mail/postfix.nix
==============================================================================
--- nixos/trunk/modules/services/mail/postfix.nix Thu May 17 19:33:55
2012 (r34160)
+++ nixos/trunk/modules/services/mail/postfix.nix Thu May 17 19:43:32
2012 (r34161)
@@ -329,10 +329,10 @@
${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf
/var/postfix/queue
fi
- ${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix
- ${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup}
/var/postfix/queue
+ ${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/postfix
+ ${pkgs.coreutils}/bin/chown -R ${user}:${setgidGroup}
/var/postfix/queue
${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue
- ${pkgs.coreutils}/bin/chown root.root /var/spool/mail
+ ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf
Modified: nixos/trunk/modules/services/misc/nix-daemon.nix
==============================================================================
--- nixos/trunk/modules/services/misc/nix-daemon.nix Thu May 17 19:33:55
2012 (r34160)
+++ nixos/trunk/modules/services/misc/nix-daemon.nix Thu May 17 19:43:32
2012 (r34161)
@@ -301,7 +301,7 @@
system.activationScripts.nix = stringAfter [ "etc" "users" ]
''
# Set up Nix.
- chown root.nixbld /nix/store
+ chown root:nixbld /nix/store
chmod 1775 /nix/store
# Nix initialisation.
Modified: nixos/trunk/modules/services/monitoring/systemhealth.nix
==============================================================================
--- nixos/trunk/modules/services/monitoring/systemhealth.nix Thu May 17
19:33:55 2012 (r34160)
+++ nixos/trunk/modules/services/monitoring/systemhealth.nix Thu May 17
19:43:32 2012 (r34161)
@@ -80,7 +80,7 @@
system.activationScripts.systemhealth = stringAfter [ "var" ]
''
mkdir -p ${rrdDir} ${htmlDir}
- chown wwwrun.wwwrun ${rrdDir} ${htmlDir}
+ chown wwwrun:wwwrun ${rrdDir} ${htmlDir}
cat >${configFile} << EOF
[paths]
@@ -110,7 +110,7 @@
EOF
- chown wwwrun.wwwrun ${configFile}
+ chown wwwrun:wwwrun ${configFile}
${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --check" wwwrun
${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --html" wwwrun
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
