packages: cleanup withDebug option

Author: katexochen

packages/by-name/contrast/node-installer-image/package.nix

@@ -14,14 +14,14 @@
   contrastPkgsStatic,
   OVMF-SNP,
   OVMF-TDX,
-  debugRuntime ? false,
+
+  withDebug ? false,
   withGPU ? false,
 }:
 
 let
   os-image = kata.image.override {
-    inherit withGPU;
-    withDebug = debugRuntime;
+    inherit withGPU withDebug;
   };
 
   ovmf = OVMF-TDX.override {
@@ -96,7 +96,7 @@ let
               path = "/opt/edgeless/@@runtimeName@@/share/qemu/efi-virtio.rom";
             }
           ];
-          inherit debugRuntime;
+          debugRuntime = withDebug;
           qemuExtraKernelParams = os-image.cmdline;
         };
         destination = "/config/contrast-node-install.json";
@@ -222,7 +222,7 @@ in
 ociImageLayout {
   manifests = [ manifest ];
   passthru = {
-    inherit debugRuntime os-image;
+    inherit withDebug os-image;
     runtimeHash = hashDirs {
       # Layers without node-installer, or we have a circular dependency!
       # To still account for node-installer changes in the runtime hash,
@@ -231,7 +231,7 @@ ociImageLayout {
       name = "runtime-hash-kata";
     };
     gpu = node-installer-image.override {
-      inherit debugRuntime;
+      inherit withDebug;
       withGPU = true;
     };
   };

packages/by-name/contrast/reference-values/package.nix

@@ -26,7 +26,7 @@ let
         };
         launch-digest = kata.calculateSnpLaunchDigest {
           inherit os-image;
-          debug = node-installer-image.debugRuntime;
+          inherit (node-installer-image) withDebug;
         };
       in
       [
@@ -58,7 +58,7 @@ let
           let
             launch-digests = kata.calculateTdxLaunchDigests {
               inherit os-image ovmf withGPU;
-              debug = node-installer-image.debugRuntime;
+              inherit (node-installer-image) withDebug;
             };
           in
           {

packages/by-name/contrast/snp-id-blocks/package.nix

@@ -14,7 +14,7 @@ let
       guestPolicy = builtins.fromJSON (builtins.readFile ../reference-values/snpGuestPolicyQEMU.json);
       launch-digest = kata.calculateSnpLaunchDigest {
         inherit os-image;
-        debug = node-installer-image.debugRuntime;
+        inherit (node-installer-image) withDebug;
       };
       idBlocks = calculateSnpIDBlock {
         snp-launch-digest = launch-digest;

packages/by-name/kata/calculateSnpLaunchDigest/package.nix

@@ -11,7 +11,7 @@
 
 {
   os-image,
-  debug,
+  withDebug ? false,
 }:
 
 let
@@ -21,7 +21,7 @@ let
 
   # Kata uses a base command line and then appends the command line from the kata config (i.e. also our node-installer config).
   # Thus, we need to perform the same steps when calculating the digest.
-  baseCmdline = if debug then kata.runtime.cmdline.debug else kata.runtime.cmdline.default;
+  baseCmdline = if withDebug then kata.runtime.cmdline.debug else kata.runtime.cmdline.default;
   cmdline = lib.strings.concatStringsSep " " [
     baseCmdline
     os-image.cmdline

packages/by-name/kata/calculateTdxLaunchDigests/package.nix

@@ -12,7 +12,7 @@
   os-image,
   ovmf,
   withGPU ? false,
-  debug,
+  withDebug ? false,
 }:
 
 let
@@ -21,7 +21,7 @@ let
   initrd = "${os-image}/initrd";
   # Kata uses a base command line and then appends the command line from the kata config (i.e. also our node-installer config).
   # Thus, we need to perform the same steps when calculating the digest.
-  baseCmdline = if debug then kata.runtime.cmdline.debug else kata.runtime.cmdline.default;
+  baseCmdline = if withDebug then kata.runtime.cmdline.debug else kata.runtime.cmdline.default;
   cmdline = lib.strings.concatStringsSep " " [
     baseCmdline
     os-image.cmdline