Merge pull request #24 from nix-community/remove-auto-entroll

Remove auto entroll leftovers
This commit is contained in:
Julian Stecklina 2022-12-11 14:48:27 +00:00 committed by GitHub
commit 30be791826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 17 deletions

View File

@ -45,7 +45,6 @@ in
''} ''}
${cfg.package}/bin/lanzatool install \ ${cfg.package}/bin/lanzatool install \
--pki-bundle ${cfg.pkiBundle} \
--public-key ${cfg.publicKeyFile} \ --public-key ${cfg.publicKeyFile} \
--private-key ${cfg.privateKeyFile} \ --private-key ${cfg.privateKeyFile} \
${config.boot.loader.efi.efiSysMountPoint} \ ${config.boot.loader.efi.efiSysMountPoint} \

View File

@ -27,14 +27,6 @@ struct InstallCommand {
#[arg(long)] #[arg(long)]
private_key: PathBuf, 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) /// EFI system partition mountpoint (e.g. efiSysMountPoint)
esp: PathBuf, esp: PathBuf,
@ -65,8 +57,6 @@ fn install(args: InstallCommand) -> Result<()> {
install::Installer::new( install::Installer::new(
PathBuf::from(lanzaboote_stub), PathBuf::from(lanzaboote_stub),
key_pair, key_pair,
args.pki_bundle,
args.auto_enroll,
args.esp, args.esp,
args.generations, args.generations,
) )

View File

@ -15,8 +15,6 @@ use crate::signature::KeyPair;
pub struct Installer { pub struct Installer {
lanzaboote_stub: PathBuf, lanzaboote_stub: PathBuf,
key_pair: KeyPair, key_pair: KeyPair,
_pki_bundle: Option<PathBuf>,
_auto_enroll: bool,
esp: PathBuf, esp: PathBuf,
generations: Vec<PathBuf>, generations: Vec<PathBuf>,
} }
@ -25,16 +23,12 @@ impl Installer {
pub fn new( pub fn new(
lanzaboote_stub: PathBuf, lanzaboote_stub: PathBuf,
key_pair: KeyPair, key_pair: KeyPair,
_pki_bundle: Option<PathBuf>,
_auto_enroll: bool,
esp: PathBuf, esp: PathBuf,
generations: Vec<PathBuf>, generations: Vec<PathBuf>,
) -> Self { ) -> Self {
Self { Self {
lanzaboote_stub, lanzaboote_stub,
key_pair, key_pair,
_pki_bundle,
_auto_enroll,
esp, esp,
generations, generations,
} }