rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-15 22:49:08 +00:00
Code Issues Releases Wiki Activity

Fix installer

Browse Source
This commit is contained in:
Darren Shepherd
2021-10-24 17:07:48 -07:00
parent 5a216b8ac4
commit db84312450
7 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/install/install.go
View File

@@ -19,8 +19,6 @@ func Run(automatic bool, configFile string) error {
if automatic && !cfg.RancherOS.Install.Automatic {
return nil
} else if automatic {
cfg.RancherOS.Install.Silent = true
}
err = Ask(&cfg)
@@ -45,7 +43,7 @@ func runInstall(cfg config.Config, output string) error {
return err
}
if !cfg.RancherOS.Install.Silent {
if !cfg.RancherOS.Install.Automatic {
val, err := questions.PromptBool("\nConfiguration\n"+"-------------\n\n"+
string(installBytes)+
"\nYour disk will be formatted and installed with the above configuration.\nContinue?", false)
@@ -54,7 +52,7 @@ func runInstall(cfg config.Config, output string) error {
}
}
if cfg.RancherOS.Install.ConfigURL == "" && !cfg.RancherOS.Install.Silent {
if cfg.RancherOS.Install.ConfigURL == "" && !cfg.RancherOS.Install.Automatic {
yip := config.YipConfig{
Rancherd: config.Rancherd{
Server: cfg.RancherOS.Install.ServerURL,
@@ -87,6 +85,11 @@ func runInstall(cfg config.Config, output string) error {
cfg.RancherOS.Install.ConfigURL = output + ".yip"
}
if err := config.ToFile(cfg, output); err != nil {
return err
}
cfg.RancherOS.Install.ConfigURL = output
ev, err := config.ToEnv(cfg)
if err != nil {
return err