ifup: fix exit code override when systemd in picture

openSUSE · Sep 15, 2014 · 7499247 · 7499247
1 parent af42097
commit 7499247
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/client/ifreload.c b/client/ifreload.c
@@ -346,11 +346,11 @@ ni_do_ifreload_direct(int argc, char **argv)
 			status = ni_ifstatus_display_result(fsm, &ifnames, &up_marked,
 				opt_transient);
 
-			/* Do not report any transient errors to systemd (e.g. dhcp
-			 * or whatever not ready in time) -- returning an error may
-			 * cause to stop the network completely.
+			/*
+			 * Do not report any errors to systemd -- returning an error
+			 * here, will cause sytemd to stop the network completely.
 			 */
-			if (!opt_systemd)
+			if (opt_systemd)
 				status = NI_LSB_RC_SUCCESS;
 		}
 	}
@@ -666,11 +666,11 @@ ni_do_ifreload_nanny(int argc, char **argv)
 		status = ni_ifstatus_display_result(fsm, &ifnames, &up_marked,
 			opt_transient);
 
-		/* Do not report any transient errors to systemd (e.g. dhcp
-		 * or whatever not ready in time) -- returning an error may
-		 * cause to stop the network completely.
+		/*
+		 * Do not report any errors to systemd -- returning an error
+		 * here, will cause sytemd to stop the network completely.
 		 */
-		if (!opt_systemd)
+		if (opt_systemd)
 			status = NI_LSB_RC_SUCCESS;
 	}
 	else {

diff --git a/client/ifup.c b/client/ifup.c
@@ -626,11 +626,11 @@ ni_do_ifup_nanny(int argc, char **argv)
 	status = ni_ifstatus_display_result(fsm, &ifnames, &ifmarked,
 		opt_transient);
 
-	/* Do not report any transient errors to systemd (e.g. dhcp
-	 * or whatever not ready in time) -- returning an error may
-	 * cause to stop the network completely.
+	/*
+	 * Do not report any errors to systemd -- returning an error
+	 * here, will cause sytemd to stop the network completely.
 	 */
-	if (!opt_systemd)
+	if (opt_systemd)
 		status = NI_LSB_RC_SUCCESS;
 
 cleanup:
@@ -900,11 +900,11 @@ ni_do_ifup_direct(int argc, char **argv)
 		status = ni_ifstatus_display_result(fsm, &ifnames, &ifmarked,
 			opt_transient);
 
-		/* Do not report any transient errors to systemd (e.g. dhcp
-		 * or whatever not ready in time) -- returning an error may
-		 * cause to stop the network completely.
+		/*
+		 * Do not report any errors to systemd -- returning an error
+		 * here, will cause sytemd to stop the network completely.
 		 */
-		if (!opt_systemd)
+		if (opt_systemd)
 			status = NI_LSB_RC_SUCCESS;
 	}