Add host.lima.internal to /etc/hosts

Signed-off-by: Jan Dubois <[email protected]>
lima-vm · Aug 4, 2021 · 50727a5 · 50727a5
1 parent fbb94ed
commit 50727a5
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/pkg/cidata/cidata.TEMPLATE.d/boot/03-etc-hosts.sh b/pkg/cidata/cidata.TEMPLATE.d/boot/03-etc-hosts.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -eux -o pipefail
+
+echo -e "${LIMA_SLIRP_GATEWAY}\thost.lima.internal" >>/etc/hosts
diff --git a/pkg/cidata/cidata.TEMPLATE.d/lima.env b/pkg/cidata/cidata.TEMPLATE.d/lima.env
@@ -1,6 +1,7 @@
 LIMA_CIDATA_USER={{ .User }}
 LIMA_CIDATA_UID={{ .UID }}
 LIMA_CIDATA_MOUNTS={{ len .Mounts }}
+LIMA_SLIRP_GATEWAY={{ .SlirpGateway }}
 {{- range $i, $val := .Mounts}}
 LIMA_CIDATA_MOUNTS_{{$i}}_MOUNTPOINT={{$val}}
 {{- end}}

diff --git a/pkg/cidata/cidata.go b/pkg/cidata/cidata.go
@@ -47,10 +47,11 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML) error {
 		return err
 	}
 	args := TemplateArgs{
-		Name:       name,
-		User:       u.Username,
-		UID:        uid,
-		Containerd: Containerd{System: *y.Containerd.System, User: *y.Containerd.User},
+		Name:         name,
+		User:         u.Username,
+		UID:          uid,
+		Containerd:   Containerd{System: *y.Containerd.System, User: *y.Containerd.User},
+		SlirpGateway: qemuconst.SlirpGateway,
 	}
 
 	pubKeys, err := sshutil.DefaultPubKeys(*y.SSH.LoadDotSSHPubKeys)

diff --git a/pkg/cidata/template.go b/pkg/cidata/template.go
@@ -28,13 +28,14 @@ type Network struct {
 	Name       string
 }
 type TemplateArgs struct {
-	Name       string // instance name
-	User       string // user name
-	UID        int
-	SSHPubKeys []string
-	Mounts     []string // abs path, accessible by the User
-	Containerd Containerd
-	Networks   []Network
+	Name         string // instance name
+	User         string // user name
+	UID          int
+	SSHPubKeys   []string
+	Mounts       []string // abs path, accessible by the User
+	Containerd   Containerd
+	Networks     []Network
+	SlirpGateway string
 }
 
 func ValidateTemplateArgs(args TemplateArgs) error {

diff --git a/pkg/qemu/qemu.go b/pkg/qemu/qemu.go
@@ -12,6 +12,7 @@ import (
 	"github.com/AkihiroSuda/lima/pkg/downloader"
 	"github.com/AkihiroSuda/lima/pkg/iso9660util"
 	"github.com/AkihiroSuda/lima/pkg/limayaml"
+	"github.com/AkihiroSuda/lima/pkg/qemu/qemuconst"
 	"github.com/AkihiroSuda/lima/pkg/store/filenames"
 	"github.com/docker/go-units"
 	"github.com/mattn/go-shellwords"
@@ -194,7 +195,8 @@ func Cmdline(cfg Config) (string, []string, error) {
 
 	// Network
 	// CIDR is intentionally hardcoded to 192.168.5.0/24, as each of QEMU has its own independent slirp network.
-	args = append(args, "-netdev", fmt.Sprintf("user,id=net0,net=192.168.5.0/24,hostfwd=tcp:127.0.0.1:%d-:22", y.SSH.LocalPort))
+	args = append(args, "-netdev", fmt.Sprintf("user,id=net0,net=%s,dhcpstart=%s,hostfwd=tcp:127.0.0.1:%d-:22",
+		qemuconst.SlirpNetwork, qemuconst.SlirpIPAddress, y.SSH.LocalPort))
 	args = append(args, "-device", "virtio-net-pci,netdev=net0,mac="+limayaml.MACAddress(cfg.InstanceDir))
 	for i, vde := range y.Network.VDE {
 		args = append(args, "-netdev", fmt.Sprintf("vde,id=net%d,sock=%s", i+1, vde.URL))

diff --git a/pkg/qemu/qemuconst/qemuconst.go b/pkg/qemu/qemuconst/qemuconst.go
@@ -2,4 +2,7 @@ package qemuconst
 
 const (
 	SlirpNICName = "eth0"
+	SlirpNetwork = "192.168.5.0/24"
+	SlirpGateway = "192.168.5.2"
+	SlirpIPAddress = "192.168.5.15"
 )