unistack-org/cloudinit
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix partition

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
This commit is contained in:
Василий Толстов 2015-07-14 15:08:12 +03:00
parent 732ff09ccd
commit 8c916a8c22
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
system/filesystem_linux.go
View File

@ -108,10 +108,11 @@ func ResizeRootFS() error {
if err != nil { if err != nil {
return err return err
} }
os.Remove(device)
if err = syscall.Mknod(device, uint32(os.ModeDevice|syscall.S_IFBLK|0600), devBlk.Int()); err != nil { if err = syscall.Mknod(device, uint32(os.ModeDevice|syscall.S_IFBLK|0600), devBlk.Int()); err != nil {
return err return err
} }
// defer os.Remove(device) defer os.Remove(device)
// mbr := make([]byte, 446) // mbr := make([]byte, 446)
/* /*
@ -196,7 +197,11 @@ func ResizeRootFS() error {
if active { if active {
stdin.Write([]byte("a\n" + fmt.Sprintf("%d", partnum) + "\n")) stdin.Write([]byte("a\n" + fmt.Sprintf("%d", partnum) + "\n"))
} }
stdin.Write([]byte("t\n" + fmt.Sprintf("%d", partnum) + "\n" + parttype + "\nw")) if partnum > 1 {
stdin.Write([]byte("t\n" + fmt.Sprintf("%d", partnum) + "\n" + parttype + "\nw"))
} else {
stdin.Write([]byte("t\n" + parttype + "\nw"))
}
cmd = exec.Command("fdisk", "-u", device) cmd = exec.Command("fdisk", "-u", device)
cmd.Stdin = &stdin cmd.Stdin = &stdin
cmd.Run() cmd.Run()
@ -238,11 +243,11 @@ func ResizeRootFS() error {
} }
} }
} }
os.Remove(partition)
if err = syscall.Mknod(partition, uint32(os.ModeDevice|syscall.S_IFBLK|0600), devFs.Int()); err != nil { if err = syscall.Mknod(partition, uint32(os.ModeDevice|syscall.S_IFBLK|0600), devFs.Int()); err != nil {
return err return err
} }
// defer os.Remove(partition) defer os.Remove(partition)
log.Printf("resize filesystem via %s %s", "resize2fs", partition) log.Printf("resize filesystem via %s %s", "resize2fs", partition)
buf, err := exec.Command("resize2fs", partition).CombinedOutput() buf, err := exec.Command("resize2fs", partition).CombinedOutput()
if err != nil { if err != nil {