From a9f4024dedc51ce039dff993f47a15137c7f2cbb Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Thu, 14 Mar 2024 11:22:37 +0100 Subject: [PATCH] lint: fix up adjusted stages --- stages/org.osbuild.anaconda | 1 - stages/org.osbuild.bootiso.mono | 1 - stages/org.osbuild.chrony | 1 - stages/org.osbuild.containers.storage.conf | 1 - stages/org.osbuild.coreos.platform | 1 - stages/org.osbuild.grub2 | 1 - stages/org.osbuild.grub2.iso | 1 - stages/org.osbuild.grub2.legacy | 1 - stages/org.osbuild.isolinux | 1 - stages/org.osbuild.livesys | 1 - stages/org.osbuild.lorax-script | 1 - stages/org.osbuild.nm.conn | 1 - stages/org.osbuild.oci-archive | 1 - stages/org.osbuild.oscap.remediation | 1 - stages/org.osbuild.ostree.aleph | 1 - stages/org.osbuild.ostree.passwd | 1 - stages/org.osbuild.ostree.preptree | 1 - stages/org.osbuild.ovf | 1 - stages/org.osbuild.rpm | 1 - stages/org.osbuild.tar | 3 --- stages/org.osbuild.yum.repos | 1 - 21 files changed, 23 deletions(-) diff --git a/stages/org.osbuild.anaconda b/stages/org.osbuild.anaconda index b3f8852a..0a5f00db 100755 --- a/stages/org.osbuild.anaconda +++ b/stages/org.osbuild.anaconda @@ -4,7 +4,6 @@ import sys import osbuild.api - CONFIG = """ # osbuild customizations diff --git a/stages/org.osbuild.bootiso.mono b/stages/org.osbuild.bootiso.mono index 41c5efe6..b98fee3c 100755 --- a/stages/org.osbuild.bootiso.mono +++ b/stages/org.osbuild.bootiso.mono @@ -10,7 +10,6 @@ import tempfile import osbuild.api import osbuild.remoteloop as remoteloop - LORAX_TEMPLATES = "/usr/share/lorax/templates.d" diff --git a/stages/org.osbuild.chrony b/stages/org.osbuild.chrony index 529bc1ed..2274a47e 100755 --- a/stages/org.osbuild.chrony +++ b/stages/org.osbuild.chrony @@ -4,7 +4,6 @@ import sys import osbuild.api - DELETE_TIME_SOURCE_LINE_REGEX = re.compile(r"(server|pool|peer) ") DELETE_LEAPSECTZ_LINE_REGEX = re.compile(r"leapsectz ") diff --git a/stages/org.osbuild.containers.storage.conf b/stages/org.osbuild.containers.storage.conf index aa062b6d..f1c7ae7c 100755 --- a/stages/org.osbuild.containers.storage.conf +++ b/stages/org.osbuild.containers.storage.conf @@ -11,7 +11,6 @@ except ModuleNotFoundError: import osbuild.api - DEFAULT_LOCATION = "/etc/containers/storage.conf" HEADER = [ diff --git a/stages/org.osbuild.coreos.platform b/stages/org.osbuild.coreos.platform index 7b4be11f..a88951cc 100755 --- a/stages/org.osbuild.coreos.platform +++ b/stages/org.osbuild.coreos.platform @@ -7,7 +7,6 @@ import sys import osbuild.api from osbuild.util import bls - # Constants # For console.cfg see https://github.com/coreos/bootupd/pull/620 # For platforms.json see https://github.com/coreos/coreos-assembler/pull/3709 diff --git a/stages/org.osbuild.grub2 b/stages/org.osbuild.grub2 index c6effdb1..87ba4d71 100755 --- a/stages/org.osbuild.grub2 +++ b/stages/org.osbuild.grub2 @@ -6,7 +6,6 @@ import sys import osbuild.api - # The main grub2 configuration file template. Used for UEFI and legacy # boot. The parameters are currently: # - $search: to specify the search criteria of how to locate grub's diff --git a/stages/org.osbuild.grub2.iso b/stages/org.osbuild.grub2.iso index 30ced722..c81f31bb 100755 --- a/stages/org.osbuild.grub2.iso +++ b/stages/org.osbuild.grub2.iso @@ -6,7 +6,6 @@ import sys import osbuild.api - # The main grub2 configuration file template. Used for UEFI. GRUB2_EFI_CFG_TEMPLATE = """ function load_video { diff --git a/stages/org.osbuild.grub2.legacy b/stages/org.osbuild.grub2.legacy index 292717d2..3df8ac86 100755 --- a/stages/org.osbuild.grub2.legacy +++ b/stages/org.osbuild.grub2.legacy @@ -6,7 +6,6 @@ import sys import osbuild.api - # The main grub2 configuration file template. Used for UEFI and legacy GRUB_CFG_TEMPLATE = """ # Created by osbuild diff --git a/stages/org.osbuild.isolinux b/stages/org.osbuild.isolinux index f16c1d57..35034cc6 100755 --- a/stages/org.osbuild.isolinux +++ b/stages/org.osbuild.isolinux @@ -6,7 +6,6 @@ import sys import osbuild.api - # The isolinux configuration template ISOLINUX_CFG_TEMPLATE = """ default vesamenu.c32 diff --git a/stages/org.osbuild.livesys b/stages/org.osbuild.livesys index 1c809382..d428b065 100755 --- a/stages/org.osbuild.livesys +++ b/stages/org.osbuild.livesys @@ -4,7 +4,6 @@ import sys import osbuild.api - PATH = "etc/sysconfig/livesys" CONFIG = """ diff --git a/stages/org.osbuild.lorax-script b/stages/org.osbuild.lorax-script index f44cc2a3..10313b72 100755 --- a/stages/org.osbuild.lorax-script +++ b/stages/org.osbuild.lorax-script @@ -6,7 +6,6 @@ import sys import osbuild.api from osbuild.util.lorax import Script, render_template - LORAX_TEMPLATES = "/usr/share/lorax/templates.d" diff --git a/stages/org.osbuild.nm.conn b/stages/org.osbuild.nm.conn index acffa716..fe53f96f 100755 --- a/stages/org.osbuild.nm.conn +++ b/stages/org.osbuild.nm.conn @@ -5,7 +5,6 @@ import sys import osbuild.api - USR_PATH = "usr/lib/NetworkManager/system-connections" diff --git a/stages/org.osbuild.oci-archive b/stages/org.osbuild.oci-archive index a3de61c6..3ace9228 100755 --- a/stages/org.osbuild.oci-archive +++ b/stages/org.osbuild.oci-archive @@ -9,7 +9,6 @@ import time import osbuild.api - DEFAULT_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" MEDIA_TYPES = { diff --git a/stages/org.osbuild.oscap.remediation b/stages/org.osbuild.oscap.remediation index 1647c0e5..5b8c1d02 100755 --- a/stages/org.osbuild.oscap.remediation +++ b/stages/org.osbuild.oscap.remediation @@ -6,7 +6,6 @@ import sys import osbuild.api from osbuild.util.mnt import mount - DATA_DIR = "/root" XCCDF_RESULTS = "oscap_eval_xccdf_results.xml" REMEDIATION_SCRIPT = "oscap_remediation.bash" diff --git a/stages/org.osbuild.ostree.aleph b/stages/org.osbuild.ostree.aleph index 560b9abb..4a8e2c8e 100755 --- a/stages/org.osbuild.ostree.aleph +++ b/stages/org.osbuild.ostree.aleph @@ -6,7 +6,6 @@ import sys import osbuild.api from osbuild.util import ostree - ALEPH_FILENAME = ".aleph-version.json" COREOS_ALEPH_FILENAME = ".coreos-aleph-version.json" diff --git a/stages/org.osbuild.ostree.passwd b/stages/org.osbuild.ostree.passwd index b03209e3..83e0e2c4 100755 --- a/stages/org.osbuild.ostree.passwd +++ b/stages/org.osbuild.ostree.passwd @@ -6,7 +6,6 @@ import sys import osbuild.api from osbuild.util import ostree - SUBUID_PATH = "etc/subuid" SUBGID_PATH = "etc/subgid" diff --git a/stages/org.osbuild.ostree.preptree b/stages/org.osbuild.ostree.preptree index b3817957..17776075 100755 --- a/stages/org.osbuild.ostree.preptree +++ b/stages/org.osbuild.ostree.preptree @@ -7,7 +7,6 @@ import tempfile from osbuild import api from osbuild.util import ostree - # Corresponds to # https://github.com/coreos/rpm-ostree/blob/7b9a20b20ecd5a2ceb11ca9edf86984dc3065183/rust/src/composepost.rs#L58 TOPLEVEL_DIRS = ["dev", "proc", "run", "sys", "sysroot", "var"] diff --git a/stages/org.osbuild.ovf b/stages/org.osbuild.ovf index ca29a34d..cfe1cbf5 100755 --- a/stages/org.osbuild.ovf +++ b/stages/org.osbuild.ovf @@ -7,7 +7,6 @@ import sys import osbuild.api from osbuild.util import checksum - OVF_TEMPLATE = """ diff --git a/stages/org.osbuild.rpm b/stages/org.osbuild.rpm index 4e8212dc..31e55f80 100755 --- a/stages/org.osbuild.rpm +++ b/stages/org.osbuild.rpm @@ -44,7 +44,6 @@ from osbuild import api from osbuild.util.mnt import mount from osbuild.util.runners import create_machine_id_if_needed - # File to mark a system as ostree booted. Also used by certain packages # like e.g. authselect, to adjust its behavior during installation. # Controlled via the `ostree_booted` option. diff --git a/stages/org.osbuild.tar b/stages/org.osbuild.tar index 20ca7c89..75690d8c 100755 --- a/stages/org.osbuild.tar +++ b/stages/org.osbuild.tar @@ -20,9 +20,6 @@ import sys import osbuild.api - - - SCHEMA_2 = """ "options": { "additionalProperties": false, diff --git a/stages/org.osbuild.yum.repos b/stages/org.osbuild.yum.repos index 85a07954..de65f2a0 100755 --- a/stages/org.osbuild.yum.repos +++ b/stages/org.osbuild.yum.repos @@ -5,7 +5,6 @@ import sys import osbuild.api - # List of repo options which should be listed in this specific order if set # in the stage options. #