Skip to content

Commit e3dd4e2

Browse files
committed
Code review
Signed-off-by: Jan Dubois <[email protected]>
1 parent a2c3535 commit e3dd4e2

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

cmd/limactl/sudoers.go

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,16 @@ func sudoersAction(cmd *cobra.Command, args []string) error {
4242
}
4343

4444
func verifySudoAccess(args []string) error {
45+
config, err := networks.Config()
46+
if err != nil {
47+
return err
48+
}
49+
if err := config.Validate(); err != nil {
50+
return err
51+
}
4552
var file string
4653
switch len(args) {
4754
case 0:
48-
config, err := networks.Config()
49-
if err != nil {
50-
return err
51-
}
5255
file = config.Paths.Sudoers
5356
if file == "" {
5457
configFile, _ := networks.ConfigFile()
@@ -59,13 +62,6 @@ func verifySudoAccess(args []string) error {
5962
default:
6063
return errors.New("can check only a single sudoers file")
6164
}
62-
config, err := networks.Config()
63-
if err != nil {
64-
return err
65-
}
66-
if err := config.Validate(); err != nil {
67-
return err
68-
}
6965
if err := config.VerifySudoAccess(file); err != nil {
7066
return err
7167
}

pkg/networks/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func loadCache() {
4545
return
4646
}
4747
configDir := filepath.Dir(configFile)
48-
cache.err = os.MkdirAll(configDir, 0700)
48+
cache.err = os.MkdirAll(configDir, 0755)
4949
if cache.err != nil {
5050
cache.err = fmt.Errorf("could not create %q directory: %w", configDir, cache.err)
5151
return

pkg/qemu/qemu.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,7 @@ func Cmdline(cfg Config) (string, []string, error) {
260260
args = append(args, "-netdev", fmt.Sprintf("user,id=net0,net=%s,dhcpstart=%s,hostfwd=tcp:127.0.0.1:%d-:22",
261261
qemu.SlirpNetwork, qemu.SlirpIPAddress, y.SSH.LocalPort))
262262
args = append(args, "-device", "virtio-net-pci,netdev=net0,mac="+limayaml.MACAddress(cfg.InstanceDir))
263-
usingVDE := false
264-
for _, nw := range y.Networks {
265-
if nw.VNL != "" {
266-
usingVDE = true
267-
}
268-
}
269-
if usingVDE && !strings.Contains(string(features.NetdevHelp), "vde") {
263+
if len(y.Networks) > 0 && !strings.Contains(string(features.NetdevHelp), "vde") {
270264
return "", nil, fmt.Errorf("netdev \"vde\" is not supported by %s ( Hint: recompile QEMU with `configure --enable-vde` )", exe)
271265
}
272266
for i, nw := range y.Networks {

0 commit comments

Comments
 (0)