localhost_frssoft/appvm
1
0
Fork 0
mirror of https://code.dumpstack.io/tools/appvm.git synced 2025-05-01 09:34:23 +00:00
Code Issues Projects Releases Wiki Activity

Avoid of changing current work directory

Browse source
This commit is contained in:
Mikhail Klementev 2020-01-09 23:13:48 +00:00
parent 1fbbdee76a
commit 2146397906
No known key found for this signature in database
GPG key ID: BE44DA8C062D87DC
2 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
appvm.go
View file

@ -106,10 +106,10 @@ func streamStdOutErr(command *cmd.Cmd) {
}
}
func generateVM(name string, verbose bool) (realpath, reginfo, qcow2 string, err error) {
func generateVM(path, name string, verbose bool) (realpath, reginfo, qcow2 string, err error) {
command := cmd.NewCmdOptions(cmd.Options{Buffered: false, Streaming: true},
"nix-build", "<nixpkgs/nixos>", "-A", "config.system.build.vm",
"-I", "nixos-config=nix/"+name+".nix", "-I", ".")
"-I", "nixos-config="+path+"/nix/"+name+".nix", "-I", path)
if verbose {
go streamStdOutErr(command)
@ -170,12 +170,7 @@ func generateAppVM(l *libvirt.Libvirt,
nixName, vmName, appvmPath, sharedDir string,
verbose, online bool) (err error) {
err = os.Chdir(appvmPath)
if err != nil {
return
}
realpath, reginfo, qcow2, err := generateVM(nixName, verbose)
realpath, reginfo, qcow2, err := generateVM(appvmPath, nixName, verbose)
if err != nil {
return
}