summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorRobert Hensing <roberth@users.noreply.github.com>2018-10-31 23:33:23 +0100
committerGitHub <noreply@github.com>2018-10-31 23:33:23 +0100
commita3dbeed475de3cf8c6688eb3a4a31ac61c8c1d13 (patch)
tree47e08debf69146afeb2c54fed7d6724161fce96e /nixos
parentc5c2da9d6c0afd259340af1177b22f8779fc698d (diff)
parent83a65a91822413316300b7c3a21798133791dfaa (diff)
downloadnixlib-a3dbeed475de3cf8c6688eb3a4a31ac61c8c1d13.tar
nixlib-a3dbeed475de3cf8c6688eb3a4a31ac61c8c1d13.tar.gz
nixlib-a3dbeed475de3cf8c6688eb3a4a31ac61c8c1d13.tar.bz2
nixlib-a3dbeed475de3cf8c6688eb3a4a31ac61c8c1d13.tar.lz
nixlib-a3dbeed475de3cf8c6688eb3a4a31ac61c8c1d13.tar.xz
nixlib-a3dbeed475de3cf8c6688eb3a4a31ac61c8c1d13.tar.zst
nixlib-a3dbeed475de3cf8c6688eb3a4a31ac61c8c1d13.zip
Merge pull request #49338 from FeepingCreature/improve-warning-message
improve shell.nix warning messages
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/programs/shell.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 6aa0262e3a4c..9842e2bef643 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -13,7 +13,7 @@ with lib;
         # Set up the per-user profile.
         mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR"
         if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then
-            echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR, should be $(id -u)" >&2
+            echo "WARNING: the per-user profile dir $NIX_USER_PROFILE_DIR should belong to user id $(id -u)" >&2
         fi
 
         if [ -w "$HOME" ]; then
@@ -35,7 +35,7 @@ with lib;
           NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER"
           mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR"
           if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then
-              echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR, should be $(id -u)" >&2
+              echo "WARNING: the per-user gcroots dir $NIX_USER_GCROOTS_DIR should belong to user id $(id -u)" >&2
           fi
 
           # Set up a default Nix expression from which to install stuff.