particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel8: make sap image config methods private

Browse source 
They are not used in a different package, so they can be private.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2023-02-07 10:32:33 +01:00 • committed by Tomáš Hozza
parent c2a290ef76
commit bd5bffc8cf
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel8/ami.go
View file

@ -338,7 +338,7 @@ func defaultAMIImageConfigX86_64(rd distribution) *distro.ImageConfig {
func defaultEc2SapImageConfigX86_64(rd distribution) *distro.ImageConfig {
// default EC2-SAP image config (x86_64)
return SapImageConfig(rd).InheritFrom(defaultEc2ImageConfigX86_64(rd))
return sapImageConfig(rd).InheritFrom(defaultEc2ImageConfigX86_64(rd))
}
// common package set for RHEL (BYOS/RHUI) and CentOS Stream images

6
internal/distro/rhel8/azure.go
View file

@ -40,7 +40,7 @@ func azureSapRhuiImgType(rd distribution) imageType {
packageSets: map[string]packageSetFunc{
osPkgsKey: azureSapPackageSet,
},
defaultImageConfig: defaultAzureRhuiImageConfig.InheritFrom(SapAzureImageConfig(rd)),
defaultImageConfig: defaultAzureRhuiImageConfig.InheritFrom(sapAzureImageConfig(rd)),
kernelOptions: defaultAzureKernelOptions,
bootable: true,
defaultSize: 64 * common.GibiByte,
@ -651,6 +651,6 @@ var defaultAzureRhuiImageConfig = &distro.ImageConfig{
},
}
func SapAzureImageConfig(rd distribution) *distro.ImageConfig {
return SapImageConfig(rd).InheritFrom(defaultAzureImageConfig)
func sapAzureImageConfig(rd distribution) *distro.ImageConfig {
return sapImageConfig(rd).InheritFrom(defaultAzureImageConfig)
}

4
internal/distro/rhel8/sap.go
View file

@ -7,8 +7,8 @@ import (
"github.com/osbuild/osbuild-composer/internal/rpmmd"
)
// SapImageConfig returns the SAP specific ImageConfig data
func SapImageConfig(rd distribution) *distro.ImageConfig {
// sapImageConfig returns the SAP specific ImageConfig data
func sapImageConfig(rd distribution) *distro.ImageConfig {
return &distro.ImageConfig{
SELinuxConfig: &osbuild.SELinuxConfigStageOptions{
State: osbuild.SELinuxStatePermissive,