Skip to content

Allow the user to specify their own grub.cfg when building and iso #14095

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
gmileka wants to merge 1 commit into
base: 3.0-dev
Choose a base branch
from
Draft

Allow the user to specify their own grub.cfg when building and iso #14095

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

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: 2 additions & 0 deletions toolkit/tools/isomaker/isomaker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var (
releaseVersion = app.Flag("release-version", "The repository OS release version").Required().String()
resourcesDirPath = app.Flag("resources", "Path to 'resources' directory").Required().ExistingDir()
outputDir = app.Flag("output-dir", "Path to directory to place final image").Required().String()
grubCfg = app.Flag("grub-cfg", "Path to iso grub.cfg to place final image").Required().String()
repoSnapshotTime = app.Flag("repo-snapshot-time", "Optional: tdnf image repo snapshot time").String()

imageTag = app.Flag("image-tag", "Tag (text) appended to the image name. Empty by default.").String()
Expand All @@ -47,6 +48,7 @@ func main() {
*initrdPath,
*isoRepoDirPath,
*outputDir,
*grubCfg,
*imageTag,
*repoSnapshotTime)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion toolkit/tools/pkg/isomakerlib/isomaker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ type IsoMaker struct {
}

// NewIsoMaker returns a new ISO maker.
func NewIsoMaker(unattendedInstall bool, baseDirPath, buildDirPath, releaseVersion, resourcesDirPath, configFilePath, initrdPath, isoRepoDirPath, outputDir, imageNameTag, isoRepoSnapshotTime string) (isoMaker *IsoMaker, err error) {
func NewIsoMaker(unattendedInstall bool, baseDirPath, buildDirPath, releaseVersion, resourcesDirPath, configFilePath, initrdPath, isoRepoDirPath, outputDir, grubCfg, imageNameTag, isoRepoSnapshotTime string) (isoMaker *IsoMaker, err error) {
if baseDirPath == "" {
baseDirPath = filepath.Dir(configFilePath)
}
Expand All @@ -90,6 +90,7 @@ func NewIsoMaker(unattendedInstall bool, baseDirPath, buildDirPath, releaseVersi
releaseVersion: releaseVersion,
resourcesDirPath: resourcesDirPath,
fetchedRepoDirPath: isoRepoDirPath,
grubCfgPath: grubCfg,
outputDirPath: outputDir,
imageNameBase: imageNameBase,
imageNameTag: imageNameTag,
Expand Down
Loading