1 files changed, 4 insertions, 0 deletions

diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index 256346eb6baa9..d54c65268abc0 100644
--- a/usr.sbin/sysinstall/msg.c
+++ b/usr.sbin/sysinstall/msg.c
@@ -237,6 +237,8 @@ msgYesNo(char *fmt, ...)
 	ioctl(0, VT_ACTIVATE, 1);	/* Switch back */
 	msgInfo(NULL);
     }
+    if (variable_get(VAR_NONINTERACTIVE))
+	return 1;	/* If non-interactive, return YES all the time */
     ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
     restorescr(w);
     return ret;
@@ -261,6 +263,8 @@ msgNoYes(char *fmt, ...)
 	ioctl(0, VT_ACTIVATE, 1);	/* Switch back */
 	msgInfo(NULL);
     }
+    if (variable_get(VAR_NONINTERACTIVE))
+	return 0;	/* If non-interactive, return NO all the time */
     ret = dialog_noyes("User Confirmation Requested", errstr, -1, -1);
     restorescr(w);
     return ret;