github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 14:23:37 +00:00
Code Issues Projects Releases Wiki Activity

Clean up diskLooksUnformatted literal

Browse Source
This commit is contained in:
Dong Liu 2017-08-11 16:11:39 +08:00
parent 35e5197eca
commit a6ff000ea5
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/mount/mount_linux.go
View File

@ -399,7 +399,7 @@ func (mounter *SafeFormatAndMount) formatAndMount(source string, target string,
return mountErr return mountErr
} }
// diskLooksUnformatted uses 'lsblk' to see if the given disk is unformated // getDiskFormat uses 'lsblk' to see if the given disk is unformated
func (mounter *SafeFormatAndMount) getDiskFormat(disk string) (string, error) { func (mounter *SafeFormatAndMount) getDiskFormat(disk string) (string, error) {
args := []string{"-n", "-o", "FSTYPE", disk} args := []string{"-n", "-o", "FSTYPE", disk}
cmd := mounter.Runner.Command("lsblk", args...) cmd := mounter.Runner.Command("lsblk", args...)

4
pkg/util/mount/mount_unsupported.go
View File

@ -61,7 +61,3 @@ func (mounter *Mounter) PathIsDevice(pathname string) (bool, error) {
func (mounter *SafeFormatAndMount) formatAndMount(source string, target string, fstype string, options []string) error { func (mounter *SafeFormatAndMount) formatAndMount(source string, target string, fstype string, options []string) error {
return nil return nil
} }
func (mounter *SafeFormatAndMount) diskLooksUnformatted(disk string) (bool, error) {
return true, nil
}