livemedia-creator: Change defaults to Red Hat Enterprise Linux 9
This changes the releasever and project defaults to RHEL 9 values. Resolves: rhbz#2019133
This commit is contained in:
parent
bfa9b7aa9b
commit
f320b3c8f4
@ -61,7 +61,7 @@ else:
|
|||||||
DRACUT_DEFAULT = ["--xz", "--install", "/.buildstamp", "--no-early-microcode", "--add", "fips"]
|
DRACUT_DEFAULT = ["--xz", "--install", "/.buildstamp", "--no-early-microcode", "--add", "fips"]
|
||||||
|
|
||||||
# Used for DNF conf.module_platform_id
|
# Used for DNF conf.module_platform_id
|
||||||
DEFAULT_PLATFORM_ID = "platform:f34"
|
DEFAULT_PLATFORM_ID = "platform:el9"
|
||||||
|
|
||||||
class ArchData(DataHolder):
|
class ArchData(DataHolder):
|
||||||
lib64_arches = ("x86_64", "ppc64le", "s390x", "ia64", "aarch64")
|
lib64_arches = ("x86_64", "ppc64le", "s390x", "ia64", "aarch64")
|
||||||
|
@ -304,9 +304,9 @@ def lmc_parser(dracut_default=""):
|
|||||||
vagrant_group.add_argument("--vagrantfile",
|
vagrant_group.add_argument("--vagrantfile",
|
||||||
help="optional vagrantfile")
|
help="optional vagrantfile")
|
||||||
|
|
||||||
parser.add_argument("--project", default="Linux",
|
parser.add_argument("--project", default="Red Hat Enterprise Linux",
|
||||||
help="substituted for @PROJECT@ in bootloader config files")
|
help="substituted for @PROJECT@ in bootloader config files")
|
||||||
parser.add_argument("--releasever", default="34",
|
parser.add_argument("--releasever", default="9",
|
||||||
help="substituted for @VERSION@ in bootloader config files")
|
help="substituted for @VERSION@ in bootloader config files")
|
||||||
parser.add_argument("--volid", default=None, help="volume id")
|
parser.add_argument("--volid", default=None, help="volume id")
|
||||||
parser.add_argument("--squashfs-only", action="store_true", default=False,
|
parser.add_argument("--squashfs-only", action="store_true", default=False,
|
||||||
|
@ -148,8 +148,8 @@ def dracut_args(opts):
|
|||||||
return DRACUT_DEFAULT
|
return DRACUT_DEFAULT
|
||||||
|
|
||||||
def make_appliance(disk_img, name, template, outfile, networks=None, ram=1024,
|
def make_appliance(disk_img, name, template, outfile, networks=None, ram=1024,
|
||||||
vcpus=1, arch=None, title="Linux", project="Linux",
|
vcpus=1, arch=None, title="Red Hat Enterprise Linux",
|
||||||
releasever="34"):
|
project="Red Hat Enterprise Linux", releasever="9"):
|
||||||
"""
|
"""
|
||||||
Generate an appliance description file
|
Generate an appliance description file
|
||||||
|
|
||||||
@ -161,9 +161,9 @@ def make_appliance(disk_img, name, template, outfile, networks=None, ram=1024,
|
|||||||
:param int ram: Ram, in MiB, passed to template. Default is 1024
|
:param int ram: Ram, in MiB, passed to template. Default is 1024
|
||||||
:param int vcpus: CPUs, passed to template. Default is 1
|
:param int vcpus: CPUs, passed to template. Default is 1
|
||||||
:param str arch: CPU architecture. Default is 'x86_64'
|
:param str arch: CPU architecture. Default is 'x86_64'
|
||||||
:param str title: Title, passed to template. Default is 'Linux'
|
:param str title: Title, passed to template. Default is 'Red Hat Enterprise Linux'
|
||||||
:param str project: Project, passed to template. Default is 'Linux'
|
:param str project: Project, passed to template. Default is 'Red Hat Enterprise Linux'
|
||||||
:param str releasever: Release version, passed to template. Default is 34
|
:param str releasever: Release version, passed to template. Default is 9
|
||||||
"""
|
"""
|
||||||
if not (disk_img and template and outfile):
|
if not (disk_img and template and outfile):
|
||||||
return None
|
return None
|
||||||
|
@ -25,7 +25,7 @@ from pylorax.sysutils import flatconfig
|
|||||||
|
|
||||||
def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None,
|
def get_dnf_base_object(installroot, sources, mirrorlists=None, repos=None,
|
||||||
enablerepos=None, disablerepos=None,
|
enablerepos=None, disablerepos=None,
|
||||||
tempdir="/var/tmp", proxy=None, releasever="34",
|
tempdir="/var/tmp", proxy=None, releasever="9",
|
||||||
cachedir=None, logdir=None, sslverify=True, dnfplugins=None):
|
cachedir=None, logdir=None, sslverify=True, dnfplugins=None):
|
||||||
""" Create a dnf Base object and setup the repositories and installroot
|
""" Create a dnf Base object and setup the repositories and installroot
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ class MkefibootTool(Tool):
|
|||||||
"""Create the efiboot.img needed for EFI booting"""
|
"""Create the efiboot.img needed for EFI booting"""
|
||||||
tools = ["mkefiboot"]
|
tools = ["mkefiboot"]
|
||||||
|
|
||||||
def run(self, isodir, tmpdir, product="Fedora"):
|
def run(self, isodir, tmpdir, product="Red Hat Enterprise Linux"):
|
||||||
cmd = ["mkefiboot", "--label=ANACONDA"]
|
cmd = ["mkefiboot", "--label=ANACONDA"]
|
||||||
if log.root.level < log.INFO:
|
if log.root.level < log.INFO:
|
||||||
cmd.append("--debug")
|
cmd.append("--debug")
|
||||||
@ -82,7 +82,7 @@ class MkmacbootTool(MkefibootTool):
|
|||||||
requirements = ["/usr/share/pixmaps/bootloader/fedora.icns",
|
requirements = ["/usr/share/pixmaps/bootloader/fedora.icns",
|
||||||
"/usr/share/pixmaps/bootloader/fedora-media.vol"]
|
"/usr/share/pixmaps/bootloader/fedora-media.vol"]
|
||||||
|
|
||||||
def run(self, isodir, tmpdir, product="Fedora"):
|
def run(self, isodir, tmpdir, product="Red Hat Enterprise Linux"):
|
||||||
cmd = ["mkefiboot", "--label", "ANACONDA",
|
cmd = ["mkefiboot", "--label", "ANACONDA",
|
||||||
"--apple", "--icon", self.requirements[0],
|
"--apple", "--icon", self.requirements[0],
|
||||||
"--diskname", self.requirements[1],
|
"--diskname", self.requirements[1],
|
||||||
|
Loading…
Reference in New Issue
Block a user