mirror of
https://github.com/MengMengCode/CLICD.git
synced 2026-08-05 05:36:07 +08:00
release: v1.1.1
This commit is contained in:
@@ -1407,7 +1407,7 @@ func ensureDefaultNetwork() error {
|
||||
}
|
||||
// Start and autostart the default network
|
||||
if out, err := exec.Command("virsh", "net-info", "default").Output(); err == nil {
|
||||
if !strings.Contains(strings.ToLower(string(out)), "active:") || !strings.Contains(strings.ToLower(string(out)), "yes") {
|
||||
if !libvirtNetworkActive(string(out)) {
|
||||
if startOut, startErr := exec.Command("virsh", "net-start", "default").CombinedOutput(); startErr != nil {
|
||||
return fmt.Errorf("failed to start libvirt default network: %v, output: %s", startErr, string(startOut))
|
||||
}
|
||||
@@ -1419,6 +1419,19 @@ func ensureDefaultNetwork() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func libvirtNetworkActive(info string) bool {
|
||||
for _, line := range strings.Split(info, "\n") {
|
||||
key, value, ok := strings.Cut(line, ":")
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
if strings.EqualFold(strings.TrimSpace(key), "Active") {
|
||||
return strings.EqualFold(strings.TrimSpace(value), "yes")
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func createOverlayDisk(base, target string, diskGB int) error {
|
||||
if diskGB < 1 {
|
||||
diskGB = 5
|
||||
|
||||
Reference in New Issue
Block a user