github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14201 from swagiaal/fix-format-and-mount-comment 

Correct comments in mount.go
pull/6/head
Eric Tune 2015-09-23 16:45:36 -07:00
parent 1311f44b0c 3e9587997f
commit f264ae67c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ func (mounter *SafeFormatAndMount) formatAndMount(source string, target string,
// Try to mount the disk // Try to mount the disk
err := mounter.Interface.Mount(source, target, fstype, options) err := mounter.Interface.Mount(source, target, fstype, options)
if err != nil { if err != nil {
// It is possible that this disk is not formatted. Double check using 'file' // It is possible that this disk is not formatted. Double check using diskLooksUnformatted
notFormatted, err := mounter.diskLooksUnformatted(source) notFormatted, err := mounter.diskLooksUnformatted(source)
if err == nil && notFormatted { if err == nil && notFormatted {
// Disk is unformatted so format it. // Disk is unformatted so format it.
@ -96,7 +96,7 @@ func (mounter *SafeFormatAndMount) formatAndMount(source string, target string,
return err return err
} }
// diskLooksUnformatted uses 'file' to see if the given disk is unformated // diskLooksUnformatted uses 'lsblk' to see if the given disk is unformated
func (mounter *SafeFormatAndMount) diskLooksUnformatted(disk string) (bool, error) { func (mounter *SafeFormatAndMount) diskLooksUnformatted(disk string) (bool, error) {
args := []string{"-nd", "-o", "FSTYPE", disk} args := []string{"-nd", "-o", "FSTYPE", disk}
cmd := mounter.Runner.Command("lsblk", args...) cmd := mounter.Runner.Command("lsblk", args...)