max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 00:08:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

SystemInstalledActivationCommand: re-exec nix as root for updateProfile

Browse source
This commit is contained in:
Max Headroom 2023-01-07 16:56:42 +01:00
parent 3f743a4428
commit 174f9921e8
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/nix/system.cc
View file

@ -96,6 +96,12 @@ struct SystemCommand : InstallableCommand
struct SystemInstalledActivationCommand : SystemCommand, MixProfile struct SystemInstalledActivationCommand : SystemCommand, MixProfile
{ {
std::string activationType; std::string activationType;
std::string selfCommandName;
SystemInstalledActivationCommand(std::string activationType, std::string selfCommandName)
: activationType(activationType),
selfCommandName(selfCommandName)
{ }
void run(nix::ref<nix::Store> store) override void run(nix::ref<nix::Store> store) override
{ {
@ -107,18 +113,33 @@ struct SystemInstalledActivationCommand : SystemCommand, MixProfile
Realise::Outputs, Realise::Outputs,
installableContext, bmNormal); installableContext, bmNormal);
if (!profile) {
profile = settings.nixStateDir + "/profiles/system";
} else {
profile = settings.nixStateDir + "/profiles/system-profiles/" + profile.value();
}
BuiltPaths buildables2; BuiltPaths buildables2;
for (auto & b : buildables) for (auto & b : buildables)
buildables2.push_back(b.path); buildables2.push_back(b.path);
updateProfile(buildables2);
executePrivileged(profile.value() + "/bin/switch-to-configuration", Strings{activationType}); if (getuid() != 0) {
Strings args {
"system", selfCommandName,
store->printStorePath(*buildables2.front().outPaths().begin())
};
if (profile) {
args.push_back("--profile");
args.push_back(profile.value());
}
executePrivileged(getSelfExe().value_or("nix"), args);
} else {
if (!profile) {
profile = settings.nixStateDir + "/profiles/system";
} else {
auto systemProfileBase = settings.nixStateDir + "/profiles/system-profiles";
if (!pathExists(systemProfileBase)) {
createDirs(systemProfileBase);
}
profile = systemProfileBase + "/" + profile.value();
}
updateProfile(buildables2);
executePrivileged(profile.value() + "/bin/switch-to-configuration", Strings{activationType});
}
} }
}; };
@ -261,9 +282,7 @@ struct CmdSystemActivate : SystemCommand, MixDryRun
struct CmdSystemApply : SystemInstalledActivationCommand struct CmdSystemApply : SystemInstalledActivationCommand
{ {
std::string activationType = "switch"; CmdSystemApply() : SystemInstalledActivationCommand("switch", "apply")
CmdSystemApply()
{ {
} }
@ -282,9 +301,7 @@ struct CmdSystemApply : SystemInstalledActivationCommand
struct CmdSystemBoot : SystemInstalledActivationCommand struct CmdSystemBoot : SystemInstalledActivationCommand
{ {
std::string activationType = "boot"; CmdSystemBoot() : SystemInstalledActivationCommand("boot","boot")
CmdSystemBoot()
{ {
} }