From 037636dd285dae17c8a64c78b7413e8e3bc30a8a Mon Sep 17 00:00:00 2001 From: Ang Zhou Date: Tue, 28 Mar 2023 10:19:07 -0700 Subject: [PATCH] resolve conflict Signed-off-by: Ang Zhou --- cmd/finch/main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/finch/main.go b/cmd/finch/main.go index 2072bd0d5..13ed92f23 100644 --- a/cmd/finch/main.go +++ b/cmd/finch/main.go @@ -111,13 +111,12 @@ func virtualMachineCommands( fc *config.Finch, ) *cobra.Command { optionalDepGroups := []*dependency.Group{vmnet.NewDependencyGroup(ecc, lcc, fs, fp, logger)} - stdLib := system.NewStdLib() return newVirtualMachineCommand( lcc, logger, optionalDepGroups, config.NewLimaApplier(fc, ecc, fs, fp.LimaOverrideConfigPath(), system.NewStdLib()), - config.NewNerdctlApplier(fssh.NewDialer(), fs, fp.LimaSSHPrivateKeyPath(), stdLib.Env("USER")), + config.NewNerdctlApplier(fssh.NewDialer(), fs, fp.LimaSSHPrivateKeyPath(), system.NewStdLib().Env("USER")), fp, fs, disk.NewUserDataDiskManager(lcc, ecc, &afero.OsFs{}, fp, system.NewStdLib().Env("HOME"), fc),