opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

guest misc fix

Browse Source
This commit is contained in:
wanyaoqi
2019-09-09 10:43:31 +08:00
parent 6fd7908ecd
commit 9293283dff
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/guest_save_image_task.go
+3 -3
View File
@@ -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)
pkg/hostman/guestfs/fsdriver/linux.go
+4 -11
View File
@@ -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