Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复 PivotRoot Invalid arguments 错误 #4

Merged
merged 9 commits into from
Sep 7, 2019
Merged

修复 PivotRoot Invalid arguments 错误 #4

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9207121
来自
taikulawo Sep 7, 2019
09d47c2
add
taikulawo Sep 7, 2019
d074e42
add
taikulawo Sep 7, 2019
1d173c9
add
taikulawo Sep 7, 2019
41c0905
add
taikulawo Sep 7, 2019
0094170
add
taikulawo Sep 7, 2019
17d47f0
.
taikulawo Sep 7, 2019
43a176c
.
taikulawo Sep 7, 2019
028961e
Merge branch 'MS_PRIVATE' of github.com:iamwwc/wwcdocker into MS_PRIVATE
taikulawo Sep 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 33 additions & 16 deletions cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import (
"github.com/urfave/cli"
)



var InitCommand = cli.Command{
Name: "__DON'T__CALL__wwcdocker__init__",
Usage: "Used in Container, User are forbidden to call this command",
Expand All @@ -33,20 +31,9 @@ var InitCommand = cli.Command{
log.Error(err)
return err
}
pwd, err := os.Getwd()
if err != nil {
log.Errorf("Get current working directory error. %s", err)
return err
}
if err := container.PivotRoot(pwd); err != nil {
log.Errorf("Error when call pivotRoot %v", err)
return err
}
defaultMountFlags := syscall.MS_NOEXEC | syscall.MS_NODEV | syscall.MS_NOSUID
if err := syscall.Mount("proc", "/proc", "proc", uintptr(defaultMountFlags), ""); err != nil {
return fmt.Errorf("Fail to mount /proc fs in container process. Error: %v", err)
}
syscall.Mount("tmpfs", "/dev", "tmpfs", syscall.MS_NOSUID|syscall.MS_STRICTATIME, "mode=755")

setUpMount()

cmdArrays := strings.Split(b, " ")
absolutePath, err := exec.LookPath(cmdArrays[0])
args := cmdArrays[1:]
Expand All @@ -64,3 +51,33 @@ var InitCommand = cli.Command{
Hidden: true,
HideHelp: true,
}

func setUpMount() error {
pwd, err := os.Getwd()
if err != nil {
log.Errorf("Get current working directory error. %s", err)
return err
}
// base := path.Dir(pwd)

// syscall.Mount(base, base, "bind", syscall.MS_BIND | syscall.MS_REC, "")
// if err := syscall.Mount("", base, "", syscall.MS_PRIVATE, ""); err != nil {
// log.Error(err)
// return err
// }

// common.Exec("mount","--make-rprivate","/")

syscall.Mount("", "/", "", syscall.MS_PRIVATE|syscall.MS_REC, "")
if err := container.PivotRoot(pwd); err != nil {
log.Errorf("Error when call pivotRoot %v", err)
return err
}


defaultMountFlags := syscall.MS_NOEXEC | syscall.MS_NODEV | syscall.MS_NOSUID
if err := syscall.Mount("proc", "/proc", "proc", uintptr(defaultMountFlags), ""); err != nil {
return fmt.Errorf("Fail to mount /proc fs in container process. Error: %v", err)
}
return syscall.Mount("tmpfs", "/dev", "tmpfs", syscall.MS_NOSUID|syscall.MS_STRICTATIME, "mode=755")
}