Skip to content
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

Jump to bottom

packages: propagate excludes for installers #201

Merged
merged 2 commits into from
Oct 12, 2023
Merged

packages: propagate excludes for installers #201

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
072bf29
packages: propagate excludes for installers
supakeen Oct 12, 2023
5d153f1
anaconda-installer: disable some dracut modules
supakeen Oct 12, 2023
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
1 change: 1 addition & 0 deletions pkg/image/anaconda_live_installer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func (img *AnacondaLiveInstaller) InstantiateManifest(m *manifest.Manifest,
img.OSVersion)

livePipeline.ExtraPackages = img.ExtraBasePackages.Include
livePipeline.ExcludePackages = img.ExtraBasePackages.Exclude

livePipeline.Variant = img.Variant
livePipeline.Biosdevname = (img.Platform.GetArch() == platform.ARCH_X86_64)
Expand Down
1 change: 1 addition & 0 deletions pkg/image/anaconda_ostree_installer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ func (img *AnacondaOSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
img.Product,
img.OSVersion)
anacondaPipeline.ExtraPackages = img.ExtraBasePackages.Include
anacondaPipeline.ExcludePackages = img.ExtraBasePackages.Exclude
anacondaPipeline.ExtraRepos = img.ExtraBasePackages.Repositories
anacondaPipeline.Users = img.Users
anacondaPipeline.Groups = img.Groups
Expand Down
1 change: 1 addition & 0 deletions pkg/image/anaconda_tar_installer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ func (img *AnacondaTarInstaller) InstantiateManifest(m *manifest.Manifest,
img.OSVersion)

anacondaPipeline.ExtraPackages = img.ExtraBasePackages.Include
anacondaPipeline.ExcludePackages = img.ExtraBasePackages.Exclude
anacondaPipeline.ExtraRepos = img.ExtraBasePackages.Repositories
anacondaPipeline.Users = img.Users
anacondaPipeline.Groups = img.Groups
Expand Down
1 change: 1 addition & 0 deletions pkg/image/ostree_simplified_installer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ func (img *OSTreeSimplifiedInstaller) InstantiateManifest(m *manifest.Manifest,
img.Product,
img.OSVersion)
coiPipeline.ExtraPackages = img.ExtraBasePackages.Include
coiPipeline.ExcludePackages = img.ExtraBasePackages.Exclude
coiPipeline.ExtraRepos = img.ExtraBasePackages.Repositories
coiPipeline.FDO = img.FDO
coiPipeline.Ignition = img.IgnitionEmbedded
Expand Down
6 changes: 4 additions & 2 deletions pkg/manifest/anaconda_installer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ type AnacondaInstaller struct {
// manifest.
Type AnacondaInstallerType

// Packages to install in addition to the ones required by the
// Packages to install and/or exclude in addition to the ones required by the
// pipeline.
ExtraPackages []string
ExtraPackages []string
ExcludePackages []string

// Extra repositories to install packages from
ExtraRepos []rpmmd.RepoConfig
Expand Down Expand Up @@ -146,6 +147,7 @@ func (p *AnacondaInstaller) getPackageSetChain(Distro) []rpmmd.PackageSet {
return []rpmmd.PackageSet{
{
Include: append(packages, p.ExtraPackages...),
Exclude: p.ExcludePackages,
Repositories: append(p.repos, p.ExtraRepos...),
InstallWeakDeps: true,
},
Expand Down
6 changes: 4 additions & 2 deletions pkg/manifest/coreos_installer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import (
type CoreOSInstaller struct {
Base

// Packages to install in addition to the ones required by the
// Packages to install or exclude in addition to the ones required by the
// pipeline.
ExtraPackages []string
ExtraPackages []string
ExcludePackages []string

// Extra repositories to install packages from
ExtraRepos []rpmmd.RepoConfig
Expand Down Expand Up @@ -125,6 +126,7 @@ func (p *CoreOSInstaller) getPackageSetChain(Distro) []rpmmd.PackageSet {
return []rpmmd.PackageSet{
{
Include: append(packages, p.ExtraPackages...),
Exclude: p.ExcludePackages,
Repositories: append(p.repos, p.ExtraRepos...),
InstallWeakDeps: true,
},
Expand Down
Loading