1
0
mirror of https://github.com/rancher/os.git synced 2025-09-16 06:59:12 +00:00

Merge power funcs and fix build issues

This commit is contained in:
Darren Shepherd
2015-02-16 22:09:26 -07:00
parent d656da6a26
commit 76e5cf8d50
5 changed files with 14 additions and 19 deletions

View File

@@ -1,7 +1,7 @@
package util
/*
#cgo LDFLAGS: -lmount -lblkid -luuid
#cgo LDFLAGS: -lmount -lblkid -luuid -lselinux
#include<blkid/blkid.h>
#include<libmount/libmount.h>
#include<stdlib.h>
@@ -17,19 +17,19 @@ func ResolveDevice(spec string) string {
cSpec := C.CString(spec)
defer C.free(unsafe.Pointer(cSpec))
cString := C.blkid_evaluate_spec(cSpec, nil)
defer C.free(unsafe.Pointer(cString))
defer C.free(unsafe.Pointer(cString))
return C.GoString(cString)
}
func GetFsType(device string) (string, error) {
var ambi * C.int
var ambi *C.int
cDevice := C.CString(device)
defer C.free(unsafe.Pointer(cDevice))
cString := C.mnt_get_fstype(cDevice, ambi, nil)
defer C.free(unsafe.Pointer(cString))
if cString != nil {
return C.GoString(cString), nil
}
}
return "", errors.New("Error while getting fstype")
}