From 184ac91ec54f87b241f4282958dd6efc8d21231f Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Tue, 24 Aug 2021 13:40:06 -0700 Subject: [PATCH] pmb/install: use kernel pkg for device when printing firewall info (MR 2093) multiple 'flavor' support will be going away --- pmb/install/_install.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pmb/install/_install.py b/pmb/install/_install.py index b6045c72..c50f7002 100644 --- a/pmb/install/_install.py +++ b/pmb/install/_install.py @@ -391,12 +391,10 @@ def print_firewall_info(args): apkbuild_has_opt = False arch = args.deviceinfo["arch"] - suffix = f"rootfs_{args.device}" - kernels = pmb.chroot.other.kernel_flavors_installed(args, suffix, - autoinstall=False) - if kernels: - kernel = f"linux-{kernels[0]}" - kernel_apkbuild = pmb.build._package.get_apkbuild(args, kernel, arch) + kernel = get_kernel_package(args, args.device) + if kernel: + kernel_apkbuild = pmb.build._package.get_apkbuild(args, kernel[0], + arch) if kernel_apkbuild: opts = kernel_apkbuild["options"] apkbuild_has_opt = "pmb:kconfigcheck-nftables" in opts