1 files changed, 2 insertions, 6 deletions
diff --git a/runit/sv.c b/runit/sv.c
index 630f1f37e..477c1ac6e 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -205,10 +205,8 @@ struct globals {
 #define islog        (G.islog       )
 #define INIT_G() do { \
 	setup_common_bufsiz(); \
-	/* need to zero out, we are NOEXEC */ \
-	rc = EXIT_SUCCESS; \
-	islog = 0; \
-	/* other fields need not be zero */ \
+	/* need to zero out, svc calls sv() repeatedly */ \
+	memset(&G, 0, sizeof(G)); \
 } while (0)
 
 
@@ -707,8 +705,6 @@ int svc_main(int argc UNUSED_PARAM, char **argv)
 	const char *optstring;
 	unsigned opts;
 
-	INIT_G();
-
 	optstring = "udopchaitkx";
 	opts = getopt32(argv, optstring);
 	argv += optind;