opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4405 from wanyaoqi/bugfix/wyq/fix-panic-on-fstab-no-content

Browse Source 
host: fix panic on fstab no content
This commit is contained in:
Zexi Li
2019-12-31 00:42:31 +08:00
committed by GitHub
parent 8cb87729a6 22c8785db1
commit a8381c0022
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestfs/fsdriver/linux.go
+11 -3
View File
@@ -204,7 +204,12 @@ func (l *sLinuxRootFs) DeployFstabScripts(rootFs IDiskPartition, disks []*deploy
var rec string
var modeRwxOwner = syscall.S_IRUSR | syscall.S_IWUSR | syscall.S_IXUSR
var fstab = fstabutils.FSTabFile(string(fstabcont))
fstab = fstab.RemoveDevices(len(disks))
if fstab != nil {
fstab = fstab.RemoveDevices(len(disks))
} else {
_fstab := make(fstabutils.FsTab, 0)
fstab = &_fstab
}
for i := 1; i < len(disks); i++ {
diskId := disks[i].DiskId
@@ -314,8 +319,11 @@ func (l *sLinuxRootFs) PrepareFsForTemplate(rootFs IDiskPartition) error {
if rootFs.Exists("/etc/fstab", false) {
fstabcont, _ := rootFs.FileGetContents("/etc/fstab", false)
fstab := fstabutils.FSTabFile(string(fstabcont))
fstab = fstab.RemoveDevices(1)
cf := fstab.ToConf()
var cf string
if fstab != nil {
fstab = fstab.RemoveDevices(1)
cf = fstab.ToConf()
}
if err := rootFs.FilePutContents("/etc/fstab", cf, false, false); err != nil {
return err
}