Merge pull request #2857 from brauner/2019-02-15/tweak_log

src/lxc/conf.c

@@ -1639,11 +1639,7 @@ static int lxc_setup_devpts(struct lxc_conf *conf)
 	if (ret < 0 || (size_t)ret >= sizeof(devpts_mntopts))
 		return -1;
 
-	ret = umount2("/dev/pts", MNT_DETACH);
-	if (ret < 0)
-		SYSWARN("Failed to unmount old devpts instance");
-	else
-		DEBUG("Unmounted old devpts instance");
+	(void)umount2("/dev/pts", MNT_DETACH);
 
 	/* Create mountpoint for devpts instance. */
 	ret = mkdir("/dev/pts", 0755);

src/lxc/network.c

@@ -2581,8 +2581,7 @@ bool lxc_delete_network_priv(struct lxc_handler *handler)
 			     netdev->name[0] != '\0' ? netdev->name : "(null)",
 			     netdev->ifindex);
 		} else if (ret < 0) {
-			errno = -ret;
-			SYSWARN("Failed to remove interface \"%s\" with index %d",
+			WARN("Failed to remove interface \"%s\" with index %d",
 			     netdev->name[0] != '\0' ? netdev->name : "(null)",
 			     netdev->ifindex);
 			goto clear_ifindices;
@@ -2606,8 +2605,7 @@ bool lxc_delete_network_priv(struct lxc_handler *handler)
 
 		ret = lxc_netdev_delete_by_name(hostveth);
 		if (ret < 0) {
-			errno = -ret;
-			SYSWARN("Failed to remove interface \"%s\" from \"%s\"",
+			WARN("Failed to remove interface \"%s\" from \"%s\"",
 			     hostveth, netdev->link);
 			goto clear_ifindices;
 		}