Skip to content

Remove non-ipv4 entry from /etc/hosts #20341

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
merged 2 commits into from
Nov 4, 2024
Merged

Remove non-ipv4 entry from /etc/hosts #20341

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b35575
Remove none ipv4 entry from /etc/hosts
iQQBot Nov 4, 2024
8346682
Fix
iQQBot Nov 4, 2024
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
21 changes: 16 additions & 5 deletions components/workspacekit/cmd/rings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,22 +695,33 @@ func makeHostnameLocal(ring2root string) error {
if err != nil {
return err
}
b, err := ioutil.ReadFile(path)
b, err := os.ReadFile(path)
if err != nil {
return err
}
bStr := string(b)
lines := strings.Split(bStr, "\n")
for i, line := range lines {
newLines := []string{}
for _, line := range lines {
fields := strings.Fields(line)
if len(fields) != 2 {
if len(fields) < 1 {
newLines = append(newLines, line)
continue
}
if strings.HasPrefix(fields[0], "#") {
newLines = append(newLines, line)
}
ip := net.ParseIP(fields[0]).To4()
if len(ip) != net.IPv4len {
continue
}
if fields[1] == hostname {
lines[i] = "127.0.0.1 " + hostname
newLines = append(newLines, "127.0.0.1 "+hostname)
} else {
newLines = append(newLines, line)
}
}
return ioutil.WriteFile(path, []byte(strings.Join(lines, "\n")), stat.Mode())
return os.WriteFile(path, []byte(strings.Join(newLines, "\n")), stat.Mode())
}

func receiveSeccmpFd(conn *net.UnixConn) (libseccomp.ScmpFd, error) {
Expand Down
Loading