runner: make prettyProcnames configurable

astro · Feb 4, 2024 · bc24209 · bc24209
1 parent 967216a
commit bc24209
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/runner.nix b/lib/runner.nix
@@ -19,14 +19,17 @@ let
   preStart = hypervisorConfig.preStart or microvmConfig.preStart;
   tapMultiQueue = hypervisorConfig.tapMultiQueue or false;
 
+  execArg = lib.optionalString microvmConfig.prettyProcname
+    ''-a "microvm@${microvmConfig.hostName}"'';
+
   runScriptBin = pkgs.buildPackages.writeScriptBin "microvm-run" ''
     #! ${pkgs.buildPackages.runtimeShell} -e
 
     ${preStart}
     ${createVolumesScript pkgs.buildPackages microvmConfig.volumes}
     ${lib.optionalString (hypervisorConfig.requiresMacvtapAsFds or false) openMacvtapFds}
 
-    exec -a "microvm-${microvmConfig.hostName}" ${command}
+    exec ${execArg} ${command}
   '';
 
   shutdownScriptBin = pkgs.buildPackages.writeScriptBin "microvm-shutdown" ''

diff --git a/nixos-modules/microvm/options.nix b/nixos-modules/microvm/options.nix
@@ -414,6 +414,14 @@ in
       description = "A Hypervisor's sandbox directory";
     };
 
+    prettyProcnames = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Set a recognizable process name right before executing the Hyperisor.
+      '';
+    };
+
     runner = mkOption {
       description = "Generated Hypervisor runner for this NixOS";
       type = with types; attrsOf package;