-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Distro: factor out
rhel10 from rhel9
And base it on `rhel_common`. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
- Loading branch information
Showing
18 changed files
with
2,459 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,286 @@ | ||
| package rhel10 | ||
|
|
||
| import ( | ||
| "github.com/osbuild/images/internal/common" | ||
| "github.com/osbuild/images/pkg/distro" | ||
| "github.com/osbuild/images/pkg/distro/rhel/rhel_common" | ||
| "github.com/osbuild/images/pkg/osbuild" | ||
| "github.com/osbuild/images/pkg/rpmmd" | ||
| ) | ||
|
|
||
| // TODO: move these to the EC2 environment | ||
| const amiKernelOptions = "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295" | ||
|
|
||
| // default EC2 images config (common for all architectures) | ||
| func baseEc2ImageConfig() *distro.ImageConfig { | ||
| return &distro.ImageConfig{ | ||
| Locale: common.ToPtr("en_US.UTF-8"), | ||
| Timezone: common.ToPtr("UTC"), | ||
| TimeSynchronization: &osbuild.ChronyStageOptions{ | ||
| Servers: []osbuild.ChronyConfigServer{ | ||
| { | ||
| Hostname: "169.254.169.123", | ||
| Prefer: common.ToPtr(true), | ||
| Iburst: common.ToPtr(true), | ||
| Minpoll: common.ToPtr(4), | ||
| Maxpoll: common.ToPtr(4), | ||
| }, | ||
| }, | ||
| // empty string will remove any occurrences of the option from the configuration | ||
| LeapsecTz: common.ToPtr(""), | ||
| }, | ||
| Keyboard: &osbuild.KeymapStageOptions{ | ||
| Keymap: "us", | ||
| X11Keymap: &osbuild.X11KeymapOptions{ | ||
| Layouts: []string{"us"}, | ||
| }, | ||
| }, | ||
| EnabledServices: []string{ | ||
| "sshd", | ||
| "NetworkManager", | ||
| "nm-cloud-setup.service", | ||
| "nm-cloud-setup.timer", | ||
| "cloud-init", | ||
| "cloud-init-local", | ||
| "cloud-config", | ||
| "cloud-final", | ||
| "reboot.target", | ||
| "tuned", | ||
| }, | ||
| DefaultTarget: common.ToPtr("multi-user.target"), | ||
| Sysconfig: []*osbuild.SysconfigStageOptions{ | ||
| { | ||
| Kernel: &osbuild.SysconfigKernelOptions{ | ||
| UpdateDefault: true, | ||
| DefaultKernel: "kernel", | ||
| }, | ||
| Network: &osbuild.SysconfigNetworkOptions{ | ||
| Networking: true, | ||
| NoZeroConf: true, | ||
| }, | ||
| NetworkScripts: &osbuild.NetworkScriptsOptions{ | ||
| IfcfgFiles: map[string]osbuild.IfcfgFile{ | ||
| "eth0": { | ||
| Device: "eth0", | ||
| Bootproto: osbuild.IfcfgBootprotoDHCP, | ||
| OnBoot: common.ToPtr(true), | ||
| Type: osbuild.IfcfgTypeEthernet, | ||
| UserCtl: common.ToPtr(true), | ||
| PeerDNS: common.ToPtr(true), | ||
| IPv6Init: common.ToPtr(false), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| SystemdLogind: []*osbuild.SystemdLogindStageOptions{ | ||
| { | ||
| Filename: "00-getty-fixes.conf", | ||
| Config: osbuild.SystemdLogindConfigDropin{ | ||
| Login: osbuild.SystemdLogindConfigLoginSection{ | ||
| NAutoVTs: common.ToPtr(0), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| CloudInit: []*osbuild.CloudInitStageOptions{ | ||
| { | ||
| Filename: "00-rhel-default-user.cfg", | ||
| Config: osbuild.CloudInitConfigFile{ | ||
| SystemInfo: &osbuild.CloudInitConfigSystemInfo{ | ||
| DefaultUser: &osbuild.CloudInitConfigDefaultUser{ | ||
| Name: "ec2-user", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| Modprobe: []*osbuild.ModprobeStageOptions{ | ||
| { | ||
| Filename: "blacklist-nouveau.conf", | ||
| Commands: osbuild.ModprobeConfigCmdList{ | ||
| osbuild.NewModprobeConfigCmdBlacklist("nouveau"), | ||
| }, | ||
| }, | ||
| { | ||
| Filename: "blacklist-amdgpu.conf", | ||
| Commands: osbuild.ModprobeConfigCmdList{ | ||
| osbuild.NewModprobeConfigCmdBlacklist("amdgpu"), | ||
| }, | ||
| }, | ||
| }, | ||
| // COMPOSER-1807 | ||
| DracutConf: []*osbuild.DracutConfStageOptions{ | ||
| { | ||
| Filename: "sgdisk.conf", | ||
| Config: osbuild.DracutConfigFile{ | ||
| Install: []string{"sgdisk"}, | ||
| }, | ||
| }, | ||
| }, | ||
| SystemdUnit: []*osbuild.SystemdUnitStageOptions{ | ||
| // RHBZ#1822863 | ||
| { | ||
| Unit: "nm-cloud-setup.service", | ||
| Dropin: "10-rh-enable-for-ec2.conf", | ||
| Config: osbuild.SystemdServiceUnitDropin{ | ||
| Service: &osbuild.SystemdUnitServiceSection{ | ||
| Environment: "NM_CLOUD_SETUP_EC2=yes", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| Authselect: &osbuild.AuthselectStageOptions{ | ||
| Profile: "sssd", | ||
| }, | ||
| SshdConfig: &osbuild.SshdConfigStageOptions{ | ||
| Config: osbuild.SshdConfigConfig{ | ||
| PasswordAuthentication: common.ToPtr(false), | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| // Default AMI (custom image built by users) images config. | ||
| // The configuration does not touch the RHSM configuration at all. | ||
| // https://issues.redhat.com/browse/COMPOSER-2157 | ||
| func defaultAMIImageConfig() *distro.ImageConfig { | ||
| return baseEc2ImageConfig() | ||
| } | ||
|
|
||
| // Default AMI x86_64 (custom image built by users) images config. | ||
| // The configuration does not touch the RHSM configuration at all. | ||
| // https://issues.redhat.com/browse/COMPOSER-2157 | ||
| func defaultAMIImageConfigX86_64() *distro.ImageConfig { | ||
| ic := defaultAMIImageConfig() | ||
| return appendEC2DracutX86_64(ic) | ||
| } | ||
|
|
||
| // common ec2 image build package set | ||
| func ec2BuildPackageSet(t *rhel_common.ImageType) rpmmd.PackageSet { | ||
| return distroBuildPackageSet(t).Append( | ||
| rpmmd.PackageSet{ | ||
| Include: []string{ | ||
| "python3-pyyaml", | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func ec2CommonPackageSet(t *rhel_common.ImageType) rpmmd.PackageSet { | ||
| ps := rpmmd.PackageSet{ | ||
| Include: []string{ | ||
| "@core", | ||
| "chrony", | ||
| "cloud-init", | ||
| "cloud-utils-growpart", | ||
| "dhcp-client", | ||
| "yum-utils", | ||
| "dracut-config-generic", | ||
| "gdisk", | ||
| "grub2", | ||
| "langpacks-en", | ||
| "NetworkManager-cloud-setup", | ||
| "redhat-release", | ||
| "redhat-release-eula", | ||
| "rsync", | ||
| "tuned", | ||
| "tar", | ||
| }, | ||
| Exclude: []string{ | ||
| "aic94xx-firmware", | ||
| "alsa-firmware", | ||
| "alsa-tools-firmware", | ||
| "biosdevname", | ||
| "firewalld", | ||
| "iprutils", | ||
| "ivtv-firmware", | ||
| "iwl1000-firmware", | ||
| "iwl100-firmware", | ||
| "iwl105-firmware", | ||
| "iwl135-firmware", | ||
| "iwl2000-firmware", | ||
| "iwl2030-firmware", | ||
| "iwl3160-firmware", | ||
| "iwl3945-firmware", | ||
| "iwl4965-firmware", | ||
| "iwl5000-firmware", | ||
| "iwl5150-firmware", | ||
| "iwl6000-firmware", | ||
| "iwl6000g2a-firmware", | ||
| "iwl6000g2b-firmware", | ||
| "iwl6050-firmware", | ||
| "iwl7260-firmware", | ||
| "libertas-sd8686-firmware", | ||
| "libertas-sd8787-firmware", | ||
| "libertas-usb8388-firmware", | ||
| "plymouth", | ||
| // RHBZ#2064087 | ||
| "dracut-config-rescue", | ||
| // RHBZ#2075815 | ||
| "qemu-guest-agent", | ||
| }, | ||
| }.Append(distroSpecificPackageSet(t)) | ||
|
|
||
| return ps | ||
| } | ||
|
|
||
| func mkAMIImgTypeX86_64() *rhel_common.ImageType { | ||
| it := rhel_common.NewImageType( | ||
| "ami", | ||
| "image.raw", | ||
| "application/octet-stream", | ||
| map[string]rhel_common.PackageSetFunc{ | ||
| rhel_common.OSPkgsKey: ec2CommonPackageSet, | ||
| }, | ||
| rhel_common.DiskImage, | ||
| []string{"build"}, | ||
| []string{"os", "image"}, | ||
| []string{"image"}, | ||
| ) | ||
|
|
||
| it.KernelOptions = amiKernelOptions | ||
| it.Bootable = true | ||
| it.DefaultSize = 10 * common.GibiByte | ||
| it.DefaultImageConfig = defaultAMIImageConfigX86_64() | ||
| it.BasePartitionTables = defaultBasePartitionTables | ||
|
|
||
| return it | ||
| } | ||
|
|
||
| func mkAMIImgTypeAarch64() *rhel_common.ImageType { | ||
| it := rhel_common.NewImageType( | ||
| "ami", | ||
| "image.raw", | ||
| "application/octet-stream", | ||
| map[string]rhel_common.PackageSetFunc{ | ||
| rhel_common.BuildPkgsKey: ec2BuildPackageSet, | ||
| rhel_common.OSPkgsKey: ec2CommonPackageSet, | ||
| }, | ||
| rhel_common.DiskImage, | ||
| []string{"build"}, | ||
| []string{"os", "image"}, | ||
| []string{"image"}, | ||
| ) | ||
|
|
||
| it.KernelOptions = "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0" | ||
| it.Bootable = true | ||
| it.DefaultSize = 10 * common.GibiByte | ||
| it.DefaultImageConfig = defaultAMIImageConfig() | ||
| it.BasePartitionTables = defaultBasePartitionTables | ||
|
|
||
| return it | ||
| } | ||
|
|
||
| func appendEC2DracutX86_64(ic *distro.ImageConfig) *distro.ImageConfig { | ||
| ic.DracutConf = append(ic.DracutConf, | ||
| &osbuild.DracutConfStageOptions{ | ||
| Filename: "ec2.conf", | ||
| Config: osbuild.DracutConfigFile{ | ||
| AddDrivers: []string{ | ||
| "nvme", | ||
| "xen-blkfront", | ||
| }, | ||
| }, | ||
| }) | ||
| return ic | ||
| } |
Oops, something went wrong.