network: Change in network bundle name

Switch from NetworkManager-basic to NetworkManager for the pending
network patch set.

Change to running each systemctl command in sequence instead of as
a single command to improve the recovery rate for network restart.

Signed-off-by: Mark D Horn <[email protected]>

network/network.go

@@ -70,7 +70,7 @@ type Messenger struct {
 
 const (
 	// RequiredBundle the bundle needed to use NetworkManager
-	RequiredBundle = "NetworkManager-basic"
+	RequiredBundle = "NetworkManager"
 
 	// IPv4 identifies the addr version as ipv4
 	IPv4 = iota
@@ -669,19 +669,26 @@ func Restart() error {
 	netMgr := IsNetworkManagerActive()
 
 	if netMgr {
-		err := cmd.RunAndLog("systemctl", "restart", "NetworkManager",
-			"systemd-resolved", "pacdiscovery")
+		err := cmd.RunAndLog("systemctl", "restart", "NetworkManager")
 		if err != nil {
 			return errors.Wrap(err)
 		}
 	} else {
-		err := cmd.RunAndLog("systemctl", "restart", "systemd-networkd",
-			"systemd-resolved", "pacdiscovery")
+		err := cmd.RunAndLog("systemctl", "restart", "systemd-networkd")
 		if err != nil {
 			return errors.Wrap(err)
 		}
 	}
 
+	err := cmd.RunAndLog("systemctl", "restart", "systemd-resolved")
+	if err != nil {
+		return errors.Wrap(err)
+	}
+
+	err = cmd.RunAndLog("systemctl", "restart", "pacdiscovery")
+	if err != nil {
+		return errors.Wrap(err)
+	}
 	return nil
 }