From 614131d6481e110c2585ee86cdf8be89d2181f0f Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Thu, 1 Dec 2022 21:15:40 +0100
Subject: [PATCH 1/2] lanzatool: remove placeholder code for auto enrolling
 uefi keys

---
 rust/lanzatool/src/cli.rs     | 10 ----------
 rust/lanzatool/src/install.rs |  6 ------
 2 files changed, 16 deletions(-)

diff --git a/rust/lanzatool/src/cli.rs b/rust/lanzatool/src/cli.rs
index ec51cf4..8745170 100644
--- a/rust/lanzatool/src/cli.rs
+++ b/rust/lanzatool/src/cli.rs
@@ -27,14 +27,6 @@ struct InstallCommand {
     #[arg(long)]
     private_key: PathBuf,
 
-    /// sbctl PKI bundle for auto enrolling key
-    #[arg(long)]
-    pki_bundle: Option<PathBuf>,
-
-    /// Auto enroll your keys. This might brick your device
-    #[arg(long, default_value = "false")]
-    auto_enroll: bool,
-
     /// EFI system partition mountpoint (e.g. efiSysMountPoint)
     esp: PathBuf,
 
@@ -65,8 +57,6 @@ fn install(args: InstallCommand) -> Result<()> {
     install::Installer::new(
         PathBuf::from(lanzaboote_stub),
         key_pair,
-        args.pki_bundle,
-        args.auto_enroll,
         args.esp,
         args.generations,
     )
diff --git a/rust/lanzatool/src/install.rs b/rust/lanzatool/src/install.rs
index 91971ca..822527d 100644
--- a/rust/lanzatool/src/install.rs
+++ b/rust/lanzatool/src/install.rs
@@ -15,8 +15,6 @@ use crate::signature::KeyPair;
 pub struct Installer {
     lanzaboote_stub: PathBuf,
     key_pair: KeyPair,
-    _pki_bundle: Option<PathBuf>,
-    _auto_enroll: bool,
     esp: PathBuf,
     generations: Vec<PathBuf>,
 }
@@ -25,16 +23,12 @@ impl Installer {
     pub fn new(
         lanzaboote_stub: PathBuf,
         key_pair: KeyPair,
-        _pki_bundle: Option<PathBuf>,
-        _auto_enroll: bool,
         esp: PathBuf,
         generations: Vec<PathBuf>,
     ) -> Self {
         Self {
             lanzaboote_stub,
             key_pair,
-            _pki_bundle,
-            _auto_enroll,
             esp,
             generations,
         }

From 36c0a13c4c84a79725ae8f3266fca3a3b265661b Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Sat, 3 Dec 2022 17:14:50 +0100
Subject: [PATCH 2/2] lanzaboote module: remove --pki-bundle option

---
 nix/lanzaboote.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nix/lanzaboote.nix b/nix/lanzaboote.nix
index 2a651ad..dad3d7c 100644
--- a/nix/lanzaboote.nix
+++ b/nix/lanzaboote.nix
@@ -46,7 +46,6 @@ in
         ''}
   
         ${cfg.package}/bin/lanzatool install \
-          --pki-bundle ${cfg.pkiBundle} \
           --public-key ${cfg.publicKeyFile} \
           --private-key ${cfg.privateKeyFile} \
           ${config.boot.loader.efi.efiSysMountPoint} \