Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
be2ca8de
Commit
be2ca8de
authored
Apr 08, 2016
by
Jan Safranek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add path to log messages.
It is useful to see the path that failed to mount in the log messages.
parent
df055333
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
nsenter_mount.go
pkg/util/mount/nsenter_mount.go
+4
-4
No files found.
pkg/util/mount/nsenter_mount.go
View file @
be2ca8de
...
...
@@ -118,7 +118,7 @@ func (n *NsenterMounter) doNsenterMount(source, target, fstype string, options [
exec
:=
exec
.
New
()
outputBytes
,
err
:=
exec
.
Command
(
nsenterPath
,
args
...
)
.
CombinedOutput
()
if
len
(
outputBytes
)
!=
0
{
glog
.
V
(
5
)
.
Infof
(
"Output
from mount command: %v"
,
string
(
outputBytes
))
glog
.
V
(
5
)
.
Infof
(
"Output
of mounting %s to %s: %v"
,
source
,
target
,
string
(
outputBytes
))
}
return
err
...
...
@@ -151,7 +151,7 @@ func (n *NsenterMounter) Unmount(target string) error {
exec
:=
exec
.
New
()
outputBytes
,
err
:=
exec
.
Command
(
nsenterPath
,
args
...
)
.
CombinedOutput
()
if
len
(
outputBytes
)
!=
0
{
glog
.
V
(
5
)
.
Infof
(
"Output
from mount command: %v"
,
string
(
outputBytes
))
glog
.
V
(
5
)
.
Infof
(
"Output
of unmounting %s: %v"
,
target
,
string
(
outputBytes
))
}
return
err
...
...
@@ -176,7 +176,7 @@ func (n *NsenterMounter) IsLikelyNotMountPoint(file string) (bool, error) {
exec
:=
exec
.
New
()
out
,
err
:=
exec
.
Command
(
nsenterPath
,
args
...
)
.
CombinedOutput
()
if
err
!=
nil
{
glog
.
V
(
2
)
.
Infof
(
"Failed findmnt command
: %v"
,
err
)
glog
.
V
(
2
)
.
Infof
(
"Failed findmnt command
for path %s: %v"
,
file
,
err
)
// Different operating systems behave differently for paths which are not mount points.
// On older versions (e.g. 2.20.1) we'd get error, on newer ones (e.g. 2.26.2) we'd get "/".
// It's safer to assume that it's not a mount point.
...
...
@@ -184,7 +184,7 @@ func (n *NsenterMounter) IsLikelyNotMountPoint(file string) (bool, error) {
}
strOut
:=
strings
.
TrimSuffix
(
string
(
out
),
"
\n
"
)
glog
.
V
(
5
)
.
Infof
(
"IsLikelyNotMountPoint findmnt output
: %v"
,
strOut
)
glog
.
V
(
5
)
.
Infof
(
"IsLikelyNotMountPoint findmnt output
for path %s: %v"
,
file
,
strOut
)
if
strOut
==
file
{
return
false
,
nil
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment