mirrors/appvm
1
0
Fork 0
mirror of https://code.dumpstack.io/tools/appvm.git synced 2024-11-04 15:33:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implements command line flag to disable internet connection

Browse source
This commit is contained in:
Mikhail Klementev 2020-01-02 20:34:35 +00:00
parent 0c35a66606
commit 13226a6a79
No known key found for this signature in database
GPG key ID: BE44DA8C062D87DC
2 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
appvm.go
View file

@ -165,7 +165,9 @@ func isRunning(l *libvirt.Libvirt, name string) bool {
return err == nil
}
func generateAppVM(l *libvirt.Libvirt, appvmPath, name string, verbose bool) (err error) {
func generateAppVM(l *libvirt.Libvirt, appvmPath, name string, verbose,
online bool) (err error) {
err = os.Chdir(appvmPath)
if err != nil {
return
@ -179,7 +181,7 @@ func generateAppVM(l *libvirt.Libvirt, appvmPath, name string, verbose bool) (er
sharedDir := fmt.Sprintf(os.Getenv("HOME") + "/appvm/" + name)
os.MkdirAll(sharedDir, 0700)
xml := generateXML(name, realpath, reginfo, qcow2, sharedDir)
xml := generateXML(name, online, realpath, reginfo, qcow2, sharedDir)
_, err = l.DomainCreateXML(xml, libvirt.DomainStartValidate)
return
}
@ -208,7 +210,9 @@ func isAppvmConfigurationExists(appvmPath, name string) bool {
return fileExists(appvmPath + "/nix/" + name + ".nix")
}
func start(l *libvirt.Libvirt, name string, verbose bool, args, open string) {
func start(l *libvirt.Libvirt, name string, verbose, online bool,
args, open string) {
appvmPath := configDir
vmHomePath := os.Getenv("HOME") + "/appvm/" + name + "/"
@ -251,7 +255,7 @@ func start(l *libvirt.Libvirt, name string, verbose bool, args, open string) {
if !verbose {
go stupidProgressBar()
}
err = generateAppVM(l, appvmPath, name, verbose)
err = generateAppVM(l, appvmPath, name, verbose, online)
if err != nil {
log.Fatal(err)
}
@ -399,6 +403,7 @@ func main() {
startQuiet := startCommand.Flag("quiet", "Less verbosity").Bool()
startArgs := startCommand.Flag("args", "Command line arguments").String()
startOpen := startCommand.Flag("open", "Pass file to application").String()
startOffline := startCommand.Flag("offline", "Disconnect").Bool()
stopName := kingpin.Command("stop", "Stop application").Arg("name", "Application name").Required().String()
dropName := kingpin.Command("drop", "Remove application data").Arg("name", "Application name").Required().String()
@ -421,7 +426,8 @@ func main() {
case "generate":
generate(l, *generateName, *generateBin, *generateVMName)
case "start":
start(l, *startName, !*startQuiet, *startArgs, *startOpen)
start(l, *startName, !*startQuiet, !*startOffline,
*startArgs, *startOpen)
case "stop":
stop(l, *stopName)
case "drop":

30
xml.go
View file

@ -5,9 +5,27 @@ import "fmt"
// You may think that you want to rewrite to proper golang structures.
// Believe me, you shouldn't.
func generateXML(name, vmNixPath, reginfo, img, sharedDir string) string {
func generateXML(name string, online bool, vmNixPath, reginfo, img, sharedDir string) string {
qemuParams := `
<qemu:commandline>
<qemu:arg value='-device'/>
<qemu:arg value='e1000,netdev=net0'/>
<qemu:arg value='-netdev'/>
<qemu:arg value='user,id=net0'/>
<qemu:arg value='-snapshot'/>
</qemu:commandline>
`
if !online {
qemuParams = `
<qemu:commandline>
<qemu:arg value='-snapshot'/>
</qemu:commandline>
`
}
return fmt.Sprintf(xmlTmpl, "appvm_"+name, vmNixPath, vmNixPath, vmNixPath,
reginfo, img, sharedDir, sharedDir, sharedDir)
reginfo, img, sharedDir, sharedDir, sharedDir, qemuParams)
}
var xmlTmpl = `
@ -68,12 +86,6 @@ var xmlTmpl = `
<target dir='home'/>
</filesystem>
</devices>
<qemu:commandline>
<qemu:arg value='-device'/>
<qemu:arg value='e1000,netdev=net0'/>
<qemu:arg value='-netdev'/>
<qemu:arg value='user,id=net0'/>
<qemu:arg value='-snapshot'/>
</qemu:commandline>
%s
</domain>
`