Merge branch 'r8' into ubi8-get-closer-to-upstream
This commit is contained in:
commit
bbf2bc3bb4
@ -27,16 +27,16 @@ selinux --enforcing
|
|||||||
services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd"
|
services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd"
|
||||||
# System bootloader configuration
|
# System bootloader configuration
|
||||||
bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1
|
bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1
|
||||||
# Clear the Master Boot Record
|
|
||||||
#zerombr
|
|
||||||
# Partition clearing information
|
|
||||||
#clearpart --all --initlabel --disklabel=gpt
|
|
||||||
# Disk partitioning information
|
# Disk partitioning information
|
||||||
part /boot/efi --fstype="efi" --size=100
|
# NOTE(neil): 2023-05-12 NONE of reqpart, clearpart, zerombr can be used. We
|
||||||
part /boot --fstype="xfs" --size=1000 --label=boot
|
# are creating partitions manually in %pre to ensure proper ordering as
|
||||||
part prepboot --fstype=biosboot --asprimary --onpart=vda3
|
# Anaconda does NOT ensure the ordering `part` commands.
|
||||||
part biosboot --fstype="biosboot" --size=1
|
part /boot/efi --fstype="efi" --onpart=vda1
|
||||||
part / --fstype="xfs" --grow --size=8000 --mkfsoptions="-m bigtime=0,inobtcount=0"
|
part /boot --fstype="xfs" --label=boot --onpart=vda2
|
||||||
|
part prepboot --fstype="prepboot" --onpart=vda3
|
||||||
|
part biosboot --fstype="biosboot" --onpart=vda4
|
||||||
|
part / --size=8000 --fstype="xfs" --mkfsoptions "-m bigtime=0,inobtcount=0" --grow --onpart=vda5
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
# Clear the Master Boot Record
|
# Clear the Master Boot Record
|
||||||
|
@ -14,16 +14,18 @@ rootpw --iscrypted thereisnopasswordanditslocked
|
|||||||
selinux --enforcing
|
selinux --enforcing
|
||||||
services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd"
|
services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd"
|
||||||
timezone UTC --isUtc
|
timezone UTC --isUtc
|
||||||
# Disk
|
|
||||||
bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0 nvme_core.io_timeout=4294967295 nvme_core.max_retries=10" --location=mbr --timeout=1
|
bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0 nvme_core.io_timeout=4294967295 nvme_core.max_retries=10" --location=mbr --timeout=1
|
||||||
#zerombr
|
|
||||||
#clearpart --all --initlabel --disklabel=gpt
|
# Disk partitioning information
|
||||||
#reqpart
|
# NOTE(neil): 2023-05-12 NONE of reqpart, clearpart, zerombr can be used. We
|
||||||
part /boot/efi --size=100 --fstype=efi --asprimary
|
# are creating partitions manually in %pre to ensure proper ordering as
|
||||||
part /boot --size=1024 --fstype=xfs --label=boot
|
# Anaconda does NOT ensure the ordering `part` commands.
|
||||||
part prepboot --fstype=biosboot --asprimary --onpart=vda3
|
part /boot/efi --fstype="efi" --onpart=vda1
|
||||||
part biosboot --size=1 --fstype=biosboot --asprimary
|
part /boot --fstype="xfs" --label=boot --onpart=vda2
|
||||||
part / --size=8000 --fstype="xfs" --mkfsoptions "-m bigtime=0,inobtcount=0"
|
part prepboot --fstype="prepboot" --onpart=vda3
|
||||||
|
part biosboot --fstype="biosboot" --onpart=vda4
|
||||||
|
part / --size=8000 --fstype="xfs" --mkfsoptions "-m bigtime=0,inobtcount=0" --grow --onpart=vda5
|
||||||
|
|
||||||
url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/
|
url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/
|
||||||
|
|
||||||
|
@ -15,15 +15,15 @@ network --hostname=localhost.localdomain
|
|||||||
services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd"
|
services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd"
|
||||||
rootpw --iscrypted thereisnopasswordanditslocked
|
rootpw --iscrypted thereisnopasswordanditslocked
|
||||||
|
|
||||||
# Partition stuff
|
# Disk partitioning information
|
||||||
zerombr
|
# NOTE(neil): 2023-05-12 NONE of reqpart, clearpart, zerombr can be used. We
|
||||||
clearpart --all --initlabel --disklabel=gpt
|
# are creating partitions manually in %pre to ensure proper ordering as
|
||||||
#reqpart
|
# Anaconda does NOT ensure the ordering `part` commands.
|
||||||
part /boot/efi --size=100 --fstype=efi --asprimary
|
part /boot/efi --fstype="efi" --onpart=vda1
|
||||||
part /boot --size=1000 --fstype=xfs --label=boot
|
part /boot --fstype="xfs" --label=boot --onpart=vda2
|
||||||
part prepboot --fstype=biosboot --asprimary --onpart=vda3
|
part prepboot --fstype="prepboot" --onpart=vda3
|
||||||
part biosboot --size=1 --fstype=biosboot --asprimary
|
part biosboot --fstype="biosboot" --onpart=vda4
|
||||||
part / --size=8000 --fstype="xfs" --mkfsoptions "-m bigtime=0,inobtcount=0" --grow
|
part / --size=8000 --fstype="xfs" --mkfsoptions "-m bigtime=0,inobtcount=0" --grow --onpart=vda5
|
||||||
shutdown
|
shutdown
|
||||||
|
|
||||||
url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/
|
url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/
|
||||||
|
Loading…
Reference in New Issue
Block a user