rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-12 21:23:13 +00:00
Code Issues Releases Wiki Activity

Fix installation and trim packages

Browse Source
This commit is contained in:
Darren Shepherd
2021-11-03 22:06:12 -07:00
parent 85e1eb9320
commit f35b3697c3
11 changed files with 167 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/install/install.go
View File

@@ -12,7 +12,7 @@ import (
)
func Run(automatic bool, configFile string, powerOff bool, silent bool) error {
cfg, err := config.ReadConfig(configFile)
cfg, err := config.ReadConfig(configFile, automatic)
if err != nil {
return err
}
@@ -58,6 +58,7 @@ func runInstall(cfg config.Config, output string) error {
if err != nil || !val {
return err
}
cfg.Data = nil
}
if cfg.RancherOS.Install.ConfigURL == "" && !cfg.RancherOS.Install.Automatic {
@@ -91,13 +92,13 @@ func runInstall(cfg config.Config, output string) error {
return err
}
cfg.RancherOS.Install.ConfigURL = output + ".yip"
} else {
if err := config.ToFile(cfg, output); err != nil {
return err
}
cfg.RancherOS.Install.ConfigURL = output
}
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