lint: fix up adjusted stages
This commit is contained in:
parent
bb58892571
commit
a9f4024ded
21 changed files with 0 additions and 23 deletions
|
|
@ -4,7 +4,6 @@ import sys
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
CONFIG = """
|
CONFIG = """
|
||||||
# osbuild customizations
|
# osbuild customizations
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@ import tempfile
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
import osbuild.remoteloop as remoteloop
|
import osbuild.remoteloop as remoteloop
|
||||||
|
|
||||||
|
|
||||||
LORAX_TEMPLATES = "/usr/share/lorax/templates.d"
|
LORAX_TEMPLATES = "/usr/share/lorax/templates.d"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ import sys
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
DELETE_TIME_SOURCE_LINE_REGEX = re.compile(r"(server|pool|peer) ")
|
DELETE_TIME_SOURCE_LINE_REGEX = re.compile(r"(server|pool|peer) ")
|
||||||
DELETE_LEAPSECTZ_LINE_REGEX = re.compile(r"leapsectz ")
|
DELETE_LEAPSECTZ_LINE_REGEX = re.compile(r"leapsectz ")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ except ModuleNotFoundError:
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_LOCATION = "/etc/containers/storage.conf"
|
DEFAULT_LOCATION = "/etc/containers/storage.conf"
|
||||||
|
|
||||||
HEADER = [
|
HEADER = [
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ import sys
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
from osbuild.util import bls
|
from osbuild.util import bls
|
||||||
|
|
||||||
|
|
||||||
# Constants
|
# Constants
|
||||||
# For console.cfg see https://github.com/coreos/bootupd/pull/620
|
# For console.cfg see https://github.com/coreos/bootupd/pull/620
|
||||||
# For platforms.json see https://github.com/coreos/coreos-assembler/pull/3709
|
# For platforms.json see https://github.com/coreos/coreos-assembler/pull/3709
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import sys
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
# The main grub2 configuration file template. Used for UEFI and legacy
|
# The main grub2 configuration file template. Used for UEFI and legacy
|
||||||
# boot. The parameters are currently:
|
# boot. The parameters are currently:
|
||||||
# - $search: to specify the search criteria of how to locate grub's
|
# - $search: to specify the search criteria of how to locate grub's
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import sys
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
# The main grub2 configuration file template. Used for UEFI.
|
# The main grub2 configuration file template. Used for UEFI.
|
||||||
GRUB2_EFI_CFG_TEMPLATE = """
|
GRUB2_EFI_CFG_TEMPLATE = """
|
||||||
function load_video {
|
function load_video {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import sys
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
# The main grub2 configuration file template. Used for UEFI and legacy
|
# The main grub2 configuration file template. Used for UEFI and legacy
|
||||||
GRUB_CFG_TEMPLATE = """
|
GRUB_CFG_TEMPLATE = """
|
||||||
# Created by osbuild
|
# Created by osbuild
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import sys
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
# The isolinux configuration template
|
# The isolinux configuration template
|
||||||
ISOLINUX_CFG_TEMPLATE = """
|
ISOLINUX_CFG_TEMPLATE = """
|
||||||
default vesamenu.c32
|
default vesamenu.c32
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ import sys
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
PATH = "etc/sysconfig/livesys"
|
PATH = "etc/sysconfig/livesys"
|
||||||
|
|
||||||
CONFIG = """
|
CONFIG = """
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import sys
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
from osbuild.util.lorax import Script, render_template
|
from osbuild.util.lorax import Script, render_template
|
||||||
|
|
||||||
|
|
||||||
LORAX_TEMPLATES = "/usr/share/lorax/templates.d"
|
LORAX_TEMPLATES = "/usr/share/lorax/templates.d"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ import sys
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
USR_PATH = "usr/lib/NetworkManager/system-connections"
|
USR_PATH = "usr/lib/NetworkManager/system-connections"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@ import time
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
DEFAULT_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
|
||||||
MEDIA_TYPES = {
|
MEDIA_TYPES = {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import sys
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
from osbuild.util.mnt import mount
|
from osbuild.util.mnt import mount
|
||||||
|
|
||||||
|
|
||||||
DATA_DIR = "/root"
|
DATA_DIR = "/root"
|
||||||
XCCDF_RESULTS = "oscap_eval_xccdf_results.xml"
|
XCCDF_RESULTS = "oscap_eval_xccdf_results.xml"
|
||||||
REMEDIATION_SCRIPT = "oscap_remediation.bash"
|
REMEDIATION_SCRIPT = "oscap_remediation.bash"
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import sys
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
from osbuild.util import ostree
|
from osbuild.util import ostree
|
||||||
|
|
||||||
|
|
||||||
ALEPH_FILENAME = ".aleph-version.json"
|
ALEPH_FILENAME = ".aleph-version.json"
|
||||||
COREOS_ALEPH_FILENAME = ".coreos-aleph-version.json"
|
COREOS_ALEPH_FILENAME = ".coreos-aleph-version.json"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import sys
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
from osbuild.util import ostree
|
from osbuild.util import ostree
|
||||||
|
|
||||||
|
|
||||||
SUBUID_PATH = "etc/subuid"
|
SUBUID_PATH = "etc/subuid"
|
||||||
SUBGID_PATH = "etc/subgid"
|
SUBGID_PATH = "etc/subgid"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ import tempfile
|
||||||
from osbuild import api
|
from osbuild import api
|
||||||
from osbuild.util import ostree
|
from osbuild.util import ostree
|
||||||
|
|
||||||
|
|
||||||
# Corresponds to
|
# Corresponds to
|
||||||
# https://github.com/coreos/rpm-ostree/blob/7b9a20b20ecd5a2ceb11ca9edf86984dc3065183/rust/src/composepost.rs#L58
|
# https://github.com/coreos/rpm-ostree/blob/7b9a20b20ecd5a2ceb11ca9edf86984dc3065183/rust/src/composepost.rs#L58
|
||||||
TOPLEVEL_DIRS = ["dev", "proc", "run", "sys", "sysroot", "var"]
|
TOPLEVEL_DIRS = ["dev", "proc", "run", "sys", "sysroot", "var"]
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ import sys
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
from osbuild.util import checksum
|
from osbuild.util import checksum
|
||||||
|
|
||||||
|
|
||||||
OVF_TEMPLATE = """<?xml version="1.0"?>
|
OVF_TEMPLATE = """<?xml version="1.0"?>
|
||||||
<Envelope xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
<Envelope xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<References>
|
<References>
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,6 @@ from osbuild import api
|
||||||
from osbuild.util.mnt import mount
|
from osbuild.util.mnt import mount
|
||||||
from osbuild.util.runners import create_machine_id_if_needed
|
from osbuild.util.runners import create_machine_id_if_needed
|
||||||
|
|
||||||
|
|
||||||
# File to mark a system as ostree booted. Also used by certain packages
|
# File to mark a system as ostree booted. Also used by certain packages
|
||||||
# like e.g. authselect, to adjust its behavior during installation.
|
# like e.g. authselect, to adjust its behavior during installation.
|
||||||
# Controlled via the `ostree_booted` option.
|
# Controlled via the `ostree_booted` option.
|
||||||
|
|
|
||||||
|
|
@ -20,9 +20,6 @@ import sys
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SCHEMA_2 = """
|
SCHEMA_2 = """
|
||||||
"options": {
|
"options": {
|
||||||
"additionalProperties": false,
|
"additionalProperties": false,
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ import sys
|
||||||
|
|
||||||
import osbuild.api
|
import osbuild.api
|
||||||
|
|
||||||
|
|
||||||
# List of repo options which should be listed in this specific order if set
|
# List of repo options which should be listed in this specific order if set
|
||||||
# in the stage options.
|
# in the stage options.
|
||||||
#
|
#
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue