Skip to content

Adjustments to more closely align with current builds #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jonathanspw wants to merge 1 commit into
base: a10
Choose a base branch
from
Draft

Adjustments to more closely align with current builds #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/boot-btrfsdisk.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<type image="oem"
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="x-systemd.growfs,compress=zstd:1"
kernelcmdline="rhgb quiet" devicepersistency="by-uuid"
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="200" firmware="uefi"
rootfs_label="almalinux"
>
<bootloader name="grub2" bls="true" console="console" timeout="5"/>
Expand Down
2 changes: 1 addition & 1 deletion components/boot-xfsdisk.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<type image="oem"
filesystem="xfs"
kernelcmdline="rhgb quiet" devicepersistency="by-uuid"
bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="500" firmware="uefi"
bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="200" firmware="uefi"
rootfs_label="almalinux"
>
<bootloader name="grub2" bls="true" console="console" timeout="5"/>
Expand Down
12 changes: 12 additions & 0 deletions config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,18 @@ if [[ "$kiwi_profiles" == *"Cloud"* ]] || [[ "$kiwi_profiles" == *"WSL"* ]]; the
systemctl enable cloud-config.service cloud-final.service cloud-init.service cloud-init-local.service cloud-init.target
fi

if [[ "$kiwi_profiles" == *"Cloud"* ]]; then
## Enable tuned
systemctl enable tuned.service

## Enabled Xen Project PVHVM drivers only on x86_64
## https://bugzilla.redhat.com/show_bug.cgi?id=1849082#c7
if [[ "$(uname -m)" == "x86_64" ]]; then
echo 'add_drivers+="xen-netfront xen-blkfront"' >> /etc/dracut.conf.d/xen_pvhvm.conf
dracut -f --regenerate-all
fi
fi

if [[ "$kiwi_profiles" == *"Azure"* ]]; then
## Enable Azure service
systemctl enable waagent.service
Expand Down
34 changes: 26 additions & 8 deletions platforms/cloud.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="almalinux"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
Expand All @@ -48,7 +48,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="almalinux"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
Expand All @@ -63,7 +63,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="almalinux"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
Expand All @@ -78,7 +78,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="almalinux"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
Expand All @@ -93,7 +93,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="almalinux"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
Expand All @@ -109,7 +109,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="almalinux"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
Expand All @@ -125,7 +125,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="almalinux"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
Expand All @@ -140,7 +140,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="almalinux"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
Expand Down Expand Up @@ -206,12 +206,30 @@
<ignore name="geolite2-city"/>
<ignore name="geolite2-country"/>
<ignore name="plymouth"/>
<ignore name="libblockdev"/>
<ignore name="volume_key-libs"/>
<ignore name="dracut-network"/>
<ignore name="dracut-squash"/>
<ignore name="flashrom"/>
<ignore name="nss*"/>
<ignore name="ntfs-*"/>
<ignore name="xkeyboard-config"/>
<ignore name="pcsc-*"/>
<ignore name="pinentry"/>
<!-- Decompose cloud-server-environment since the group doesn't exist in RHEL -->
<namedCollection name="standard"/>
<package name="cloud-init"/>
<package name="cloud-utils-growpart"/>
<package name="dracut-config-generic"/>
<package name="glibc-langpack-en"/>
<package name="virt-what"/>
<package name="tuned"/>
<package name="tar"/>
<package name="tcpdump"/>
<package name="rsync"/>
<package name="quota"/>
<package name="nfs-utils"/>
<package name="hdparm"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="Cloud-Base-AmazonEC2">
<package name="awscli2"/>
Expand Down
8 changes: 4 additions & 4 deletions platforms/vagrant.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="centos"
>
<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
Expand All @@ -31,7 +31,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="centos"
>
<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
Expand All @@ -47,7 +47,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="centos"
>
<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
Expand All @@ -64,7 +64,7 @@
filesystem="xfs"
kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8"
devicepersistency="by-uuid"
bootpartition="false" efipartsize="500" firmware="uefi"
bootpartition="false" efipartsize="200" firmware="uefi"
rootfs_label="centos"
>
<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
Expand Down