Merge pull request #1759 from rancher/dont-remove-ipv4ll-ip-either

Don't auto-remove the ipv4ll ip we just added

cmd/control/os.go

@@ -53,7 +53,7 @@ func osSubcommands() []cli.Command {
 					Usage: "do not reboot after upgrade",
 				},
 				cli.BoolFlag{
-					Name:  "kexec",
+					Name:  "kexec, k",
 					Usage: "reboot using kexec",
 				},
 				cli.StringFlag{
@@ -206,7 +206,7 @@ func startUpgradeContainer(image string, stage, force, reboot, kexec bool, upgra
 	}
 
 	if kexec {
-		command = append(command, "-k")
+		command = append(command, "--kexec")
 	}
 
 	kernelArgs = strings.TrimSpace(kernelArgs)

netconf/netconf_linux.go

@@ -395,7 +395,7 @@ func applyInterfaceConfig(link netlink.Link, netConf InterfaceConfig) error {
 	}
 	for _, addr := range existingAddrs {
 		if _, ok := addrMap[addr.IPNet.String()]; !ok {
-			if netConf.DHCP {
+			if netConf.DHCP || netConf.IPV4LL {
 				// let the dhcpcd take care of it
 				log.Infof("leaving  %s from %s", addr.String(), link.Attrs().Name)
 			} else {