From 9293283dff945507828336db28c7e75ef6198ecd Mon Sep 17 00:00:00 2001
From: wanyaoqi <wanyaoqi@yunionyun.com>
Date: Mon, 9 Sep 2019 10:43:31 +0800
Subject: [PATCH] guest misc fix

---
 pkg/compute/tasks/guest_save_image_task.go |  6 +++---
 pkg/hostman/guestfs/fsdriver/linux.go      | 15 ++++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkg/compute/tasks/guest_save_image_task.go b/pkg/compute/tasks/guest_save_image_task.go
index d495e310f8..c98ba71cfd 100644
--- a/pkg/compute/tasks/guest_save_image_task.go
+++ b/pkg/compute/tasks/guest_save_image_task.go
@@ -38,7 +38,7 @@ func (self *GuestSaveImageTask) OnInit(ctx context.Context, obj db.IStandaloneMo
 	guest := obj.(*models.SGuest)
 	log.Infof("Saving server image: %s", guest.Name)
 	if restart, _ := self.GetParams().Bool("restart"); restart {
-		self.SetStage("on_stop_server_complete", nil)
+		self.SetStage("OnStopServerComplete", nil)
 		guest.StartGuestStopTask(ctx, self.GetUserCred(), false, self.GetTaskId())
 	} else {
 		self.OnStopServerComplete(ctx, guest, nil)
@@ -46,7 +46,7 @@ func (self *GuestSaveImageTask) OnInit(ctx context.Context, obj db.IStandaloneMo
 }
 
 func (self *GuestSaveImageTask) OnStopServerComplete(ctx context.Context, guest *models.SGuest, body jsonutils.JSONObject) {
-	self.SetStage("on_save_root_image_complete", nil)
+	self.SetStage("OnSaveRootImageComplete", nil)
 	disks := guest.CategorizeDisks()
 	if err := disks.Root.StartDiskSaveTask(ctx, self.GetUserCred(), self.GetParams(), self.GetTaskId()); err != nil {
 		self.SetStageFailed(ctx, err.Error())
@@ -55,7 +55,7 @@ func (self *GuestSaveImageTask) OnStopServerComplete(ctx context.Context, guest
 
 func (self *GuestSaveImageTask) OnSaveRootImageComplete(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {
 	if restart, _ := self.GetParams().Bool("restart"); restart {
-		self.SetStage("on_start_server_complete", nil)
+		self.SetStage("OnStartServerComplete", nil)
 		guest.StartGueststartTask(ctx, self.GetUserCred(), nil, self.GetTaskId())
 	} else {
 		self.SetStageComplete(ctx, nil)
diff --git a/pkg/hostman/guestfs/fsdriver/linux.go b/pkg/hostman/guestfs/fsdriver/linux.go
index 06c5981d1d..cdf58e62d8 100644
--- a/pkg/hostman/guestfs/fsdriver/linux.go
+++ b/pkg/hostman/guestfs/fsdriver/linux.go
@@ -486,17 +486,6 @@ func (d *sDebianLikeRootFs) PrepareFsForTemplate(rootFs IDiskPartition) error {
 			return errors.Wrap(err, "file put content /etc/network/interface")
 		}
 	}
-	for _, dir := range []string{
-		"/etc/network/interface.d",
-		"/etc/network/if-pre-up.d", "/etc/network/if-up.d", "/etc/network/if-post-up.d",
-		"/etc/network/if-pre-down.d", "/etc/network/if-down.d", "/etc/network/if-post-down.d",
-	} {
-		if rootFs.Exists(dir, false) {
-			if err := rootFs.Cleandir(dir, true, true); err != nil {
-				return errors.Wrapf(err, "clean dir %s", dir)
-			}
-		}
-	}
 	return nil
 }
 
@@ -798,6 +787,10 @@ func (r *sRedhatLikeRootFs) PrepareFsForTemplate(rootFs IDiskPartition) error {
 	for i := 0; i < len(files); i++ {
 		if strings.HasPrefix(files[i], "ifcfg-") && files[i] != "ifcfg-lo" {
 			rootFs.Remove(path.Join(networkPath, files[i]), false)
+			continue
+		}
+		if strings.HasPrefix(files[i], "route-") {
+			rootFs.Remove(path.Join(networkPath, files[i]), false)
 		}
 	}
 	return nil