From 25ded48024ba82699da0be93eda3bc1838155dfe Mon Sep 17 00:00:00 2001
From: p_caiwfeng <p_caiwfeng@tencent.com>
Date: Sat, 28 Aug 2021 13:35:54 +0800
Subject: [PATCH] fix bugs

---
 dns/dns_unix.go |  2 +-
 pkg/main.go     | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dns/dns_unix.go b/dns/dns_unix.go
index 35feb5fc..95b12824 100644
--- a/dns/dns_unix.go
+++ b/dns/dns_unix.go
@@ -12,10 +12,10 @@ import (
 
 func DNS(ip string, namespace string) error {
 	var err error
+	_ = os.RemoveAll(filepath.Join("/", "etc", "resolver"))
 	if err = os.MkdirAll(filepath.Join("/", "etc", "resolver"), fs.ModePerm); err != nil {
 		log.Error(err)
 	}
-	_ = os.RemoveAll(filepath.Join("/", "etc", "resolver"))
 	filename := filepath.Join("/", "etc", "resolver", "local")
 	fileContent := "nameserver " + ip
 	_ = ioutil.WriteFile(filename, []byte(fileContent), fs.ModePerm)
diff --git a/pkg/main.go b/pkg/main.go
index 9b4b28a2..54234d0d 100644
--- a/pkg/main.go
+++ b/pkg/main.go
@@ -260,16 +260,17 @@ func RenameNic() {
 	interfaces, _ := net.Interfaces()
 	for _, i := range interfaces {
 		if strings.Contains(i.Name, " ") {
-			out, err := exec.Command("netsh", []string{
+			cmd := exec.Command("netsh", []string{
 				"interface",
 				"set",
 				"interface",
 				fmt.Sprintf("name='%s'", i.Name),
-				"newname=" + strings.TrimSpace(i.Name),
-			}...).CombinedOutput()
+				"newname=" + strings.ReplaceAll(i.Name, " ", ""),
+			}...)
+			out, err := cmd.CombinedOutput()
 			if err != nil {
-				log.Warnf("rename %s --> %s failed, out: %s, error: %s",
-					i.Name, strings.TrimSpace(i.Name), string(out), err)
+				log.Warnf("rename %s --> %s failed, out: %s, error: %v, command: %s",
+					i.Name, strings.ReplaceAll(i.Name, " ", ""), string(out), err, cmd.Args)
 			}
 		}
 	}