philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Get effective user in Nix commands

Browse source 
‘geteuid’ gives us the user that the command is being run as,
including in setuid modes. By using geteuid to determind id, we can
avoid the ‘sudo -i’ hack when upgrading Nix. So now, upgrading Nix on
macOS is as simple as:

$ sudo nix-channel --update
$ sudo nix-env -u

$ sudo launchctl stop org.nixos.nix-daemon
$ sudo launchctl start org.nixos.nix-daemon
or
$ sudo systemctl restart nix-daemon
This commit is contained in:
Matthew Bauer 2018-09-04 19:32:39 -05:00
parent 5e0a7206f5
commit 74f6d8767d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/util.cc
View file

@ -468,7 +468,7 @@ static Lazy<Path> getHome2([]() {
std::vector<char> buf(16384); std::vector<char> buf(16384);
struct passwd pwbuf; struct passwd pwbuf;
struct passwd * pw; struct passwd * pw;
if (getpwuid_r(getuid(), &pwbuf, buf.data(), buf.size(), &pw) != 0 if (getpwuid_r(geteuid(), &pwbuf, buf.data(), buf.size(), &pw) != 0
|| !pw || !pw->pw_dir || !pw->pw_dir[0]) || !pw || !pw->pw_dir || !pw->pw_dir[0])
throw Error("cannot determine user's home directory"); throw Error("cannot determine user's home directory");
homeDir = pw->pw_dir; homeDir = pw->pw_dir;

2
src/nix-channel/nix-channel.cc
View file

@ -169,7 +169,7 @@ int main(int argc, char ** argv)
// Figure out the name of the channels profile. // Figure out the name of the channels profile.
; ;
auto pw = getpwuid(getuid()); auto pw = getpwuid(geteuid());
std::string name = pw ? pw->pw_name : getEnv("USER", ""); std::string name = pw ? pw->pw_name : getEnv("USER", "");
if (name.empty()) if (name.empty())
throw Error("cannot figure out user name"); throw Error("cannot figure out user name");