From ac740b7fdc147bc9ccb03ef0f78f638b96d1b618 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 7 Jun 2016 10:50:05 +0200 Subject: [PATCH] meta-digi-dey: trustfence: Explicitely check for "1" for variable enable https://jira.digi.com/browse/DEL-2603 Signed-off-by: Alex Gonzalez --- meta-digi-dey/classes/trustfence.bbclass | 2 +- meta-digi-dey/recipes-core/systemd/systemd-serialgetty.bbappend | 2 +- .../recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass index bd627dec7..e37dc54d2 100644 --- a/meta-digi-dey/classes/trustfence.bbclass +++ b/meta-digi-dey/classes/trustfence.bbclass @@ -26,7 +26,7 @@ python () { import hashlib # Secure console configuration - if d.getVar("TRUSTFENCE_CONSOLE_DISABLE", True): + if (d.getVar("TRUSTFENCE_CONSOLE_DISABLE", True) == "1"): d.appendVar("UBOOT_EXTRA_CONF", "CONFIG_CONSOLE_DISABLE=y ") if d.getVar("TRUSTFENCE_CONSOLE_PASSPHRASE_ENABLE", True): passphrase_hash = hashlib.sha256(d.getVar("TRUSTFENCE_CONSOLE_PASSPHRASE_ENABLE")).hexdigest() diff --git a/meta-digi-dey/recipes-core/systemd/systemd-serialgetty.bbappend b/meta-digi-dey/recipes-core/systemd/systemd-serialgetty.bbappend index 551283000..f489f61be 100644 --- a/meta-digi-dey/recipes-core/systemd/systemd-serialgetty.bbappend +++ b/meta-digi-dey/recipes-core/systemd/systemd-serialgetty.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2016 Digi International. python __anonymous () { - if d.getVar("TRUSTFENCE_CONSOLE_DISABLE", True): + if (d.getVar("TRUSTFENCE_CONSOLE_DISABLE", True) == "1"): d.setVar("SERIAL_CONSOLES", "") } diff --git a/meta-digi-dey/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/meta-digi-dey/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend index 551283000..f489f61be 100644 --- a/meta-digi-dey/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend +++ b/meta-digi-dey/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2016 Digi International. python __anonymous () { - if d.getVar("TRUSTFENCE_CONSOLE_DISABLE", True): + if (d.getVar("TRUSTFENCE_CONSOLE_DISABLE", True) == "1"): d.setVar("SERIAL_CONSOLES", "") }