From 26166e8f51c6a81f131c086ca62c036504e02586 Mon Sep 17 00:00:00 2001 From: demmm Date: Sat, 3 Sep 2022 14:36:45 +0200 Subject: [PATCH] [dracut] add asked for schema.yaml corrected if statement --- src/modules/dracut/dracut.schema.yaml | 9 +++++++++ src/modules/dracut/main.py | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 src/modules/dracut/dracut.schema.yaml diff --git a/src/modules/dracut/dracut.schema.yaml b/src/modules/dracut/dracut.schema.yaml new file mode 100644 index 000000000..503b1a4f0 --- /dev/null +++ b/src/modules/dracut/dracut.schema.yaml @@ -0,0 +1,9 @@ +# SPDX-FileCopyrightText: 2022 Anke Boersma +# SPDX-License-Identifier: GPL-3.0-or-later +--- +$schema: https://json-schema.org/schema# +$id: https://calamares.io/schemas/dracut +additionalProperties: false +type: object +properties: + kernelName: { type: string } diff --git a/src/modules/dracut/main.py b/src/modules/dracut/main.py index 32f9a842e..071406580 100644 --- a/src/modules/dracut/main.py +++ b/src/modules/dracut/main.py @@ -36,10 +36,10 @@ def run_dracut(): """ kernelName = libcalamares.job.configuration['kernelName'] - if kernelName != 0: - return check_target_env_call(['dracut', '-f', '{}'.format(kernelName)]) - else: + if not kernelName: return check_target_env_call(['dracut', '-f']) + else: + return check_target_env_call(['dracut', '-f', '{}'.format(kernelName)]) def run():