mirror of
https://github.com/rocky-linux/createhdds.git
synced 2024-12-22 01:58:30 +00:00
Merge pull request #10 from rocky-linux/9.0_release
This commit is contained in:
Lukas Magauer
GitHub
commit
6940a2d695
@ -197,8 +197,7 @@ class GuestfsImage(object):
|
||||
|
||||
class VirtInstallImage(object):
|
||||
"""Class representing an image created by virt-install. 'release'
|
||||
is the release the image will be built for. 'variant' is the
|
||||
variant whose install tree should be used. 'arch' is the arch.
|
||||
is the release the image will be built for. 'arch' is the arch.
|
||||
'size' is the desired image size, in gigabytes. 'imgver' is
|
||||
the image 'version' - in practice it's simply a string that gets
|
||||
included in the image file name if specified. 'maxage' is the
|
||||
@ -207,7 +206,7 @@ class VirtInstallImage(object):
|
||||
rebuild it. 'bootopts' are used to pass boot options to the
|
||||
virtual image to provide better control of the VM.
|
||||
"""
|
||||
def __init__(self, name, release, arch, size, variant=None, imgver='', maxage=14, bootopts=None):
|
||||
def __init__(self, name, release, arch, size, imgver='', maxage=14, bootopts=None):
|
||||
self.name = name
|
||||
self.size = size
|
||||
self.filename = "disk_rocky{0}_{1}".format(str(release), name)
|
||||
@ -215,16 +214,8 @@ class VirtInstallImage(object):
|
||||
self.filename = "{0}_{1}".format(self.filename, imgver)
|
||||
self.filename = "{0}_{1}.qcow2".format(self.filename, arch)
|
||||
self.release = release
|
||||
self.variant = variant
|
||||
self.arch = arch
|
||||
self.maxage = maxage
|
||||
if variant:
|
||||
self.variant = variant
|
||||
else:
|
||||
if str(release).isdigit() and int(release) < 24:
|
||||
self.variant = "Server"
|
||||
else:
|
||||
self.variant = "Everything"
|
||||
self.bootopts = bootopts
|
||||
|
||||
@property
|
||||
@ -265,7 +256,7 @@ class VirtInstallImage(object):
|
||||
if shortid not in out:
|
||||
# this will just use the most recent rocky release number
|
||||
# virt-install / osinfo knows
|
||||
shortid = 'rocky-unknown'
|
||||
shortid = "rocky{0}".format(self.release).split('.')[0] + "-unknown"
|
||||
|
||||
# destroy and delete the domain we use for all virt-installs
|
||||
conn = libvirt.open()
|
||||
@ -286,22 +277,13 @@ class VirtInstallImage(object):
|
||||
arch = self.arch
|
||||
rockydir = 'rocky/linux'
|
||||
memsize = '3072'
|
||||
if arch == 'i686':
|
||||
arch = 'i386'
|
||||
if arch in ['ppc64','ppc64le']:
|
||||
rockydir = 'rocky-secondary'
|
||||
memsize = '4096'
|
||||
if arch == 'i386':
|
||||
# i686 is in rocky-secondary (until it died)
|
||||
rockydir = 'rocky-secondary'
|
||||
|
||||
variant = self.variant
|
||||
# From F31 onwards, Workstation tree is not installable and we
|
||||
# build Workstation images out of Everything
|
||||
# We will always use the dvd1 ISO and the closest behavior is the Everything variant
|
||||
variant = 'Everything'
|
||||
try:
|
||||
# loctmp is the Distribution tree installation source. Point at the good location
|
||||
#loctmp = "https://download.rockylinux.org/stg/rocky/{0}/BaseOS/{1}/os"
|
||||
loctmp = "https://download.rockylinux.org/pub/rocky/{0}/BaseOS/{1}/os"
|
||||
ksfile = self.kickstart_file
|
||||
xargs = "inst.ks=file:/{0}".format(ksfile)
|
||||
@ -474,8 +456,6 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None):
|
||||
name = imggrp['name']
|
||||
# this is the second place we set a default for maxage - bit ugly
|
||||
maxage = int(imggrp.get('maxage', 14))
|
||||
# ditto variant
|
||||
variant = imggrp.get('variant')
|
||||
if not releases:
|
||||
releases = imggrp['releases']
|
||||
size = imggrp.get('size', 0)
|
||||
@ -490,7 +470,7 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None):
|
||||
continue
|
||||
key = "{0}-{1}".format(rel, arch)
|
||||
# using a dict here avoids dupes
|
||||
imgs[key] = VirtInstallImage(name, rel, arch, variant=variant, size=size,
|
||||
imgs[key] = VirtInstallImage(name, rel, arch, size=size,
|
||||
imgver=imgver, maxage=maxage, bootopts=bootopts)
|
||||
return list(imgs.values())
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
bootloader --location=mbr
|
||||
network --bootproto=dhcp
|
||||
url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
|
||||
url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
|
||||
lang en_US.UTF-8
|
||||
keyboard us
|
||||
timezone --utc America/New_York
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
bootloader --location=mbr --append="console=tty0 quiet"
|
||||
network --bootproto=dhcp
|
||||
url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
|
||||
url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
|
||||
lang en_US.UTF-8
|
||||
keyboard us
|
||||
timezone --utc America/New_York
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
bootloader --location=mbr
|
||||
network --bootproto=dhcp
|
||||
url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
|
||||
url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
|
||||
lang en_US.UTF-8
|
||||
keyboard us
|
||||
timezone --utc America/New_York
|
||||
|
||||
39
hdds.json
39
hdds.json
@ -2,19 +2,19 @@
|
||||
"guestfs" : [
|
||||
{
|
||||
"name" : "full",
|
||||
"size" : "10G",
|
||||
"size" : "25G",
|
||||
"labels" : ["mbr", "gpt"],
|
||||
"parts" : [
|
||||
{
|
||||
"filesystem" : "ext4",
|
||||
"type" : "p",
|
||||
"start" : "4096",
|
||||
"end" : "10485760"
|
||||
"end" : "26214400"
|
||||
},
|
||||
{
|
||||
"filesystem" : "ext4",
|
||||
"type" : "p",
|
||||
"start" : "10485761",
|
||||
"start" : "26214401",
|
||||
"end" : "-4097"
|
||||
}
|
||||
],
|
||||
@ -125,48 +125,51 @@
|
||||
{
|
||||
"name" : "minimal",
|
||||
"releases" : {
|
||||
"8.5" : ["x86_64", "aarch64"]
|
||||
"8" : ["x86_64", "aarch64"],
|
||||
"9" : ["x86_64", "aarch64"]
|
||||
},
|
||||
"size" : "10"
|
||||
"size" : "15"
|
||||
},
|
||||
{
|
||||
"name" : "minimal-uefi",
|
||||
"releases" : {
|
||||
"8.5" : ["x86_64", "aarch64"]
|
||||
"8" : ["x86_64", "aarch64"],
|
||||
"9" : ["x86_64", "aarch64"]
|
||||
},
|
||||
"size" : "10",
|
||||
"size" : "15",
|
||||
"bootopts": "uefi"
|
||||
},
|
||||
{
|
||||
"name" : "desktop",
|
||||
"releases" : {
|
||||
"8.5": ["x86_64", "aarch64"]
|
||||
"8": ["x86_64", "aarch64"],
|
||||
"9" : ["x86_64", "aarch64"]
|
||||
},
|
||||
"size" : "20",
|
||||
"variant": "Workstation"
|
||||
"size" : "20"
|
||||
},
|
||||
{
|
||||
"name" : "desktopencrypt",
|
||||
"releases" : {
|
||||
"8.5" : ["x86_64", "aarch64"]
|
||||
"8" : ["x86_64", "aarch64"],
|
||||
"9" : ["x86_64", "aarch64"]
|
||||
},
|
||||
"size" : "20",
|
||||
"variant": "Workstation"
|
||||
"size" : "20"
|
||||
},
|
||||
{
|
||||
"name" : "server",
|
||||
"releases" : {
|
||||
"8.5" : ["x86_64", "aarch64"]
|
||||
"8" : ["x86_64", "aarch64"],
|
||||
"9" : ["x86_64", "aarch64"]
|
||||
},
|
||||
"size" : "7",
|
||||
"variant": "Server"
|
||||
"size" : "9"
|
||||
},
|
||||
{
|
||||
"name" : "support",
|
||||
"releases" : {
|
||||
"8.5" : ["x86_64", "aarch64"]
|
||||
"8" : ["x86_64", "aarch64"],
|
||||
"9" : ["x86_64", "aarch64"]
|
||||
},
|
||||
"size" : "11"
|
||||
"size" : "15"
|
||||
}
|
||||
],
|
||||
"renames" : []
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
bootloader --location=mbr
|
||||
network --bootproto=dhcp
|
||||
url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
|
||||
url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
|
||||
lang en_US.UTF-8
|
||||
keyboard us
|
||||
timezone --utc America/New_York
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
bootloader --location=mbr
|
||||
network --bootproto=dhcp
|
||||
url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
|
||||
url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
|
||||
lang en_US.UTF-8
|
||||
keyboard us
|
||||
timezone --utc America/New_York
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
bootloader --location=mbr
|
||||
network --bootproto=dhcp
|
||||
url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
|
||||
url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
|
||||
lang en_US.UTF-8
|
||||
keyboard us
|
||||
timezone --utc America/New_York
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
bootloader --location=mbr
|
||||
network --bootproto=dhcp
|
||||
url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
|
||||
url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
|
||||
#repo --name="epel" --baseurl="http://mirrors.kernel.org/fedora-epel/8/Everything/x86_64/"
|
||||
# use epel to keep scsi-target-utils instead of targetcli
|
||||
lang en_US.UTF-8
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
bootloader --location=mbr
|
||||
network --device=link --activate --bootproto=dhcp
|
||||
url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
|
||||
url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
|
||||
lang en_US.UTF-8
|
||||
keyboard us
|
||||
timezone --utc America/New_York
|
||||
|
||||
Loading…
Reference in New Issue
Block a user