Print yip output to installPanel if applyNetworks() fails

Signed-off-by: Tim Serong <[email protected]>
harvester · May 23, 2024 · db9cdbb · db9cdbb
1 parent a5fd14b
commit db9cdbb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/console/install_panels.go b/pkg/console/install_panels.go
@@ -2064,8 +2064,8 @@ func addInstallPanel(c *Console) error {
 
 				if c.config.Install.ManagementInterface.Method == config.NetworkMethodDHCP {
 					printToPanel(c.Gui, "Configuring network...", installPanel)
-					if _, err := applyNetworks(c.config.ManagementInterface, c.config.Hostname); err != nil {
-						printToPanel(c.Gui, fmt.Sprintf("can't apply networks: %s", err), installPanel)
+					if output, err := applyNetworks(c.config.ManagementInterface, c.config.Hostname); err != nil {
+						printToPanel(c.Gui, fmt.Sprintf("Can't apply networks: %s\n%s", err, string(output)), installPanel)
 						return
 					}
 				}

diff --git a/pkg/console/network.go b/pkg/console/network.go
@@ -63,7 +63,7 @@ func applyNetworks(network config.Network, hostname string) ([]byte, error) {
 		"/etc/sysconfig/network/dhcp").CombinedOutput()
 	if err != nil {
 		logrus.Error(err, string(output))
-		return nil, err
+		return output, err
 	}
 
 	conf := &yipSchema.YipConfig{
@@ -100,7 +100,7 @@ func applyNetworks(network config.Network, hostname string) ([]byte, error) {
 	bytes, err = cmd.CombinedOutput()
 	if err != nil {
 		logrus.Error(err, string(bytes))
-		return nil, err
+		return bytes, err
 	}
 	// Restore Down NIC to up
 	if err := upAllLinks(); err != nil {