From d5ac2e76e0a1b9239fb8e3251a33f26c0a9af8e8 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 16 May 2021 15:50:10 +0000 Subject: [PATCH] add a sata disk mode for freebsd 12 Signed-off-by: Christine Dodrill --- main.go | 12 +++++++++--- templates/base.xml | 13 +++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 64d626b..b195cea 100644 --- a/main.go +++ b/main.go @@ -37,6 +37,7 @@ var ( zvolSize = flag.Int("zvol-size", 25, "the number of gigabytes for the virtual machine disk") memory = flag.Int("memory", 512, "the number of megabytes of ram for the virtual machine") cloudConfig = flag.String("user-data", "./var/xe-base.yaml", "path to a cloud-config userdata file") + useSATA = flag.Bool("use-sata", false, "use SATA for the VM's disk interface? (needed if using freebsd-12)") ) func main() { @@ -99,9 +100,12 @@ func main() { log.Printf("ram: %d MB", *memory) log.Printf("id: %s", vmID) log.Printf("cloud config: %s", *cloudConfig) + if *useSATA { + log.Println("using SATA for the VM disk interface") + } reader := bufio.NewReader(os.Stdin) - fmt.Print("press enter if this looks okay:") + fmt.Print("press enter if this looks okay: ") reader.ReadString('\n') cdir, err := os.UserCacheDir() @@ -149,8 +153,8 @@ func main() { if hash != resultDistro.Sha256Sum { log.Println("hash mismatch, someone is doing something nasty") - log.Printf("want: %s", resultDistro.Sha256Sum) - log.Printf("got: %s", resultDistro.Sha256Sum) + log.Printf("want: %q", resultDistro.Sha256Sum) + log.Printf("got: %q", hash) os.Exit(1) } @@ -228,6 +232,7 @@ func main() { ZVol string Seed string MACAddress string + SATA bool }{ Name: *name, UUID: vmID, @@ -235,6 +240,7 @@ func main() { ZVol: zvol, Seed: isoPath, MACAddress: macAddress, + SATA: *useSATA, }) if err != nil { log.Fatalf("can't generate VM template: %v", err) diff --git a/templates/base.xml b/templates/base.xml index 6a2a202..39b226e 100644 --- a/templates/base.xml +++ b/templates/base.xml @@ -36,19 +36,32 @@ + {{if .SATA}} + + {{else}} + {{end}} + {{if .SATA}} + + {{else}} + {{end}} + {{if .SATA}} + +
+ {{else}} + {{end}}