Skip to content

Fix/33 #34

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

Merged
ahmetozer merged 3 commits into from
Aug 9, 2025
Merged

Fix/33 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c265ec8
fix: touch infinite loop
ahmetozer Aug 9, 2025
621c0a0
feat: check symlink of resolv file
ahmetozer Aug 9, 2025
65d1d5b
fix: append cont name to hosts
ahmetozer Aug 9, 2025
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
1 change: 1 addition & 0 deletions pkg/container/cruntime/mount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ func Touch(path string) error {
if os.IsNotExist(err) {
os.MkdirAll(filepath.Dir(path), 0o0600)
if !createTry {
createTry = true
goto CREATE_FILE
}
} else if err != nil {
Expand Down
18 changes: 18 additions & 0 deletions pkg/container/cruntime/resolv-host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ func createResolv(c *config.Config, d *[]byte) error {
}
}

if info, err := os.Lstat("/etc/resolv.conf"); err == nil {
// Check if it's a symlink
if info.Mode()&os.ModeSymlink != 0 {
slog.Warn("symlink detected", "info", "/etc/resolv.conf is not a regular file, it will deleted. To keep orginal use --resolv=image")
}
os.Remove("/etc/resolv.conf")
}

if strings.Contains(".", c.Resolv) || strings.Contains(":", c.Resolv) {
*d = nil
nameServers := strings.Split(c.Resolv, ";")
Expand Down Expand Up @@ -87,6 +95,16 @@ func createHosts(c *config.Config, d *[]byte) error {
slog.Debug("unable to write /etc/hosts", "path", path.Join(sandalChildWorkdir, "/etc/hosts"))
return err
}

f, err := os.OpenFile(path.Join(sandalChildWorkdir, "/etc/hosts"), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
if err != nil {
return err
}
defer f.Close()
if _, err = f.WriteString(fmt.Sprintf("127.0.0.1\t%s\n::1\t%s\n", c.Name, c.Name)); err != nil {
return err
}

err = mount(path.Join(sandalChildWorkdir, "/etc/hosts"), "/etc/hosts", "tmpfs", syscall.MS_BIND, "ro")
return err
}
Loading