Skip to content

OCI improvements #1873

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 4 commits into from
Apr 1, 2025
Merged

OCI improvements #1873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef4063e
incusd/main_forknet: Handle missing DNS in DHCP response
stgraber Apr 1, 2025
8a2c9c6
incusd/instance/lxc: Pass limited environment to forkstart
stgraber Apr 1, 2025
60b7707
incusd/instance/lxc: Don't reset resolv.conf
stgraber Apr 1, 2025
fe09085
incusd/main_forknet: Use Fprintf
stgraber Apr 1, 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
50 changes: 26 additions & 24 deletions cmd/incusd/main_forknet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,41 +325,43 @@ func (c *cmdForknet) RunDHCP(cmd *cobra.Command, args []string) error {
return nil
}

if lease.Offer.YourIPAddr == nil || lease.Offer.YourIPAddr.Equal(net.IPv4zero) || lease.Offer.SubnetMask() == nil || len(lease.Offer.Router()) != 1 || len(lease.Offer.DNS()) < 1 {
if lease.Offer.YourIPAddr == nil || lease.Offer.YourIPAddr.Equal(net.IPv4zero) || lease.Offer.SubnetMask() == nil || len(lease.Offer.Router()) != 1 {
fmt.Fprintf(os.Stderr, "Giving up on DHCP, lease for %q didn't contain required fields\n", iface)
return nil
}

// DNS configuration.
f, err := os.Create(filepath.Join(args[0], "resolv.conf"))
if err != nil {
fmt.Fprintf(os.Stderr, "Giving up on DHCP, couldn't prepare resolv.conf: %v\n", err)
return nil
}

defer f.Close()

for _, nameserver := range lease.Offer.DNS() {
_, err = f.Write([]byte(fmt.Sprintf("nameserver %s\n", nameserver)))
if len(lease.Offer.DNS()) > 0 {
// DNS configuration.
f, err := os.Create(filepath.Join(args[0], "resolv.conf"))
if err != nil {
fmt.Fprintf(os.Stderr, "Giving up on DHCP, couldn't prepare resolv.conf: %v\n", err)
return nil
}
}

if lease.Offer.DomainName() != "" {
_, err = f.Write([]byte(fmt.Sprintf("domain %s\n", lease.Offer.DomainName())))
if err != nil {
fmt.Fprintf(os.Stderr, "Giving up on DHCP, couldn't prepare resolv.conf: %v\n", err)
return nil
defer f.Close()

for _, nameserver := range lease.Offer.DNS() {
_, err = fmt.Fprintf(f, "nameserver %s\n", nameserver)
if err != nil {
fmt.Fprintf(os.Stderr, "Giving up on DHCP, couldn't prepare resolv.conf: %v\n", err)
return nil
}
}
}

if lease.Offer.DomainSearch() != nil && len(lease.Offer.DomainSearch().Labels) > 0 {
_, err = f.Write([]byte(fmt.Sprintf("search %s\n", strings.Join(lease.Offer.DomainSearch().Labels, ", "))))
if err != nil {
fmt.Fprintf(os.Stderr, "Giving up on DHCP, couldn't prepare resolv.conf: %v\n", err)
return nil
if lease.Offer.DomainName() != "" {
_, err = fmt.Fprintf(f, "domain %s\n", lease.Offer.DomainName())
if err != nil {
fmt.Fprintf(os.Stderr, "Giving up on DHCP, couldn't prepare resolv.conf: %v\n", err)
return nil
}
}

if lease.Offer.DomainSearch() != nil && len(lease.Offer.DomainSearch().Labels) > 0 {
_, err = fmt.Fprintf(f, "search %s\n", strings.Join(lease.Offer.DomainSearch().Labels, ", "))
if err != nil {
fmt.Fprintf(os.Stderr, "Giving up on DHCP, couldn't prepare resolv.conf: %v\n", err)
return nil
}
}
}

Expand Down
42 changes: 33 additions & 9 deletions internal/server/instance/drivers/driver_lxc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2483,17 +2483,11 @@ ff02::2 ip6-allrouters
return "", nil, err
}

f, err := os.Create(filepath.Join(d.Path(), "network", "resolv.conf"))
f, err := os.OpenFile(filepath.Join(d.Path(), "network", "resolv.conf"), os.O_RDWR|os.O_CREATE, 0o644)
if err != nil {
return "", nil, err
}

err = f.Chmod(0o644)
if err != nil {
f.Close()
return "", nil, err
}

f.Close()

err = lxcSetConfigItem(cc, "lxc.mount.entry", fmt.Sprintf("%s etc/resolv.conf none bind,create=file", filepath.Join(d.Path(), "network", "resolv.conf")))
Expand Down Expand Up @@ -2784,8 +2778,38 @@ func (d *lxc) Start(stateful bool) error {

name := project.Instance(d.Project().Name, d.name)

// Start the LXC container
_, err = subprocess.RunCommand(
// Setup minimal environment for forkstart.
envDict := map[string]string{
"container": "lxc",
}

for k, v := range d.expandedConfig {
if strings.HasPrefix(k, "environment.") {
envDict[strings.TrimPrefix(k, "environment.")] = v
}
}

for _, keepEnv := range []string{"LD_LIBRARY_PATH", "INCUS_DIR", "INCUS_SOCKET"} {
if os.Getenv(keepEnv) != "" {
envDict[keepEnv] = os.Getenv(keepEnv)
}
}

_, ok := envDict["PATH"]
if !ok {
envDict["PATH"] = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
}

env := make([]string, 0, len(envDict))
for k, v := range envDict {
env = append(env, fmt.Sprintf("%s=%s", k, v))
}

// Start the LXC container.
_, _, err = subprocess.RunCommandSplit(
context.TODO(),
env,
nil,
d.state.OS.ExecPath,
"forkstart",
name,
Expand Down