kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-09-12 12:36:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle --source in install/manual-install/interactive-install the same way

Browse Source 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
This commit is contained in:
Dimitris Karakasilis
2023-09-28 15:55:14 +03:00
parent c58efaa623
commit 15a926ad3b
3 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/agent/interactive_install.go
View File

@@ -282,9 +282,11 @@ func InteractiveInstall(debug, spawnShell bool, sourceImg string) error {
if err != nil {
fmt.Printf("could not write event cloud init: %s\n", err.Error())
}
// override cc with our new config object from the scan, so it's updated for the RunInstall function
// TODO: Alternative solution: pass a reader here (the new feature) and add the image source
cc, _ = config.Scan(collector.Directories(tmpdir), collector.MergeBootLine, collector.NoLogs)
cliConf := generateInstallConfForCLIArgs(sourceImg)
cc, _ = config.Scan(collector.Directories(tmpdir),
collector.Readers(strings.NewReader(cliConf)),
collector.MergeBootLine, collector.NoLogs)
}
pterm.Info.Println("Starting installation")
@@ -292,7 +294,7 @@ func InteractiveInstall(debug, spawnShell bool, sourceImg string) error {
ccString, _ := cc.String()
pterm.Info.Println(ccString)
err = RunInstall(cc, sourceImg)
err = RunInstall(cc)
if err != nil {
pterm.Error.Println(err.Error())
}