github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

squash the commits into one

Browse Source
This commit is contained in:
jianglingxia 2017-09-04 09:34:10 +08:00
parent 0dedd13ad7
commit 4629c8a54e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,6 @@ const (
procMountsPath = "/proc/mounts" procMountsPath = "/proc/mounts"
// Location of the mountinfo file // Location of the mountinfo file
procMountInfoPath = "/proc/self/mountinfo" procMountInfoPath = "/proc/self/mountinfo"
)
const (
// 'fsck' found errors and corrected them // 'fsck' found errors and corrected them
fsckErrorsCorrected = 1 fsckErrorsCorrected = 1
// 'fsck' found errors but exited without correcting them // 'fsck' found errors but exited without correcting them
@ -76,7 +73,7 @@ func New(mounterPath string) Interface {
// required, call Mount with an empty string list or nil. // required, call Mount with an empty string list or nil.
func (mounter *Mounter) Mount(source string, target string, fstype string, options []string) error { func (mounter *Mounter) Mount(source string, target string, fstype string, options []string) error {
// Path to mounter binary if containerized mounter is needed. Otherwise, it is set to empty. // Path to mounter binary if containerized mounter is needed. Otherwise, it is set to empty.
// All Linux distros are expected to be shipped with a mount utility that an support bind mounts. // All Linux distros are expected to be shipped with a mount utility that a support bind mounts.
mounterPath := "" mounterPath := ""
bind, bindRemountOpts := isBind(options) bind, bindRemountOpts := isBind(options)
if bind { if bind {
@ -449,7 +446,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}
glog.V(4).Infof("Attempting to determine if disk %q is formatted using lsblk with args: (%v)", disk, args) glog.V(4).Infof("Attempting to determine if disk %q is formatted using lsblk with args: (%v)", disk, args)