Skip to content

Use elemental instead of cos #2014

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

Merged
frelon merged 1 commit into from
Mar 15, 2024
Merged

Use elemental instead of cos #2014

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 pkg/action/build-iso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func grubCfgTemplate(arch string) string {

menuentry "%s" --class os --unrestricted {
echo Loading kernel...
linux ($root)` + constants.ISOKernelPath(arch) + ` cdroot root=live:CDLABEL=%s rd.live.dir=/ rd.live.squashimg=rootfs.squashfs console=tty1 console=ttyS0 rd.cos.disable cos.setup=` + constants.ISOCloudInitPath + `
linux ($root)` + constants.ISOKernelPath(arch) + ` cdroot root=live:CDLABEL=%s rd.live.dir=/ rd.live.squashimg=rootfs.squashfs console=tty1 console=ttyS0 elemental.disable elemental.setup=` + constants.ISOCloudInitPath + `
echo Loading initrd...
initrd ($root)` + constants.ISOInitrdPath(arch) + `
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/runstage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func RunStage(cfg *types.Config, stage string, strict bool, cloudInitPaths ...st
for _, line := range cmdLineArgs {
if strings.Contains(line, "=") {
lineSplit := strings.Split(line, "=")
if lineSplit[0] == "cos.setup" {
if lineSplit[0] == "cos.setup" || lineSplit[0] == "elemental.setup" {
cloudInitPaths = append(cloudInitPaths, strings.TrimSpace(lineSplit[1]))
cfg.Logger.Debugf("Found cos.setup stanza on cmdline with value %s", lineSplit[1])
}
Expand Down