From ff3f13cdd05cda852f30b1d5e4947321e8406eee Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Wed, 27 Jul 2016 12:14:25 +0200
Subject: [PATCH] Make Lynis run in quick mode by default

---
 include/consts      | 2 +-
 include/helper_show | 2 +-
 include/parameters  | 4 ++++
 lynis.8             | 6 +++++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/consts b/include/consts
index 3b30ee97..19223a60 100644
--- a/include/consts
+++ b/include/consts
@@ -219,7 +219,7 @@ unset LANG
     LOG_INCORRECT_OS=1          # Log tests with incorrect OS
     NEVERBREAK=0                # Don't wait for user input
     PENTESTINGMODE=0            # Try tests without root privileges
-    QUICKMODE=0                 # Don't wait for user input
+    QUICKMODE=1                 # Don't wait for user input
     QUIET=0                     # Show normal messages and warnings as well
     SKIPLOGTEST=0               # Skip logging for one test
     SKIP_UPGRADE_TEST=0         # Skip upgrade test
diff --git a/include/helper_show b/include/helper_show
index 1d838092..0cc04810 100644
--- a/include/helper_show
+++ b/include/helper_show
@@ -30,7 +30,7 @@
 
 COMMANDS="audit show update"
 HELPERS="audit configure show update"
-OPTIONS="--auditor\n--check-all (-c)\n--config\n--cronjob (--cron)\n--debug\n--developer\n--help (-h)\n--info\n--license-key --log-file\n--manpage (--man)\n--no-colors --no-log\n--pentest\n--profile\n--plugins-dir\n--quiet (-q)\n--quick (-Q)\n--report-file\n--reverse-colors\n--tests\n--tests-from-category\n--tests-from-group\n--upload\n--verbose\n--version (-V)"
+OPTIONS="--auditor\n--check-all (-c)\n--config\n--cronjob (--cron)\n--debug\n--developer\n--help (-h)\n--info\n--license-key --log-file\n--manpage (--man)\n--no-colors --no-log\n--pentest\n--profile\n--plugins-dir\n--quiet (-q)\n--quick (-Q)\n--report-file\n--reverse-colors\n--tests\n--tests-from-category\n--tests-from-group\n--upload\n--verbose\n--version (-V)\n--wait"
 
 SHOW_ARGS="categories changelog commands dbdir groups help hostids includedir language license logfile man options pidfile plugindir profiles release releasedate report settings tests version workdir"
 SHOW_HELP="lynis show ${BROWN}categories${NORMAL}              (display test categories)
diff --git a/include/parameters b/include/parameters
index 9adabe6d..848dc453 100644
--- a/include/parameters
+++ b/include/parameters
@@ -337,6 +337,10 @@
                 fi
             ;;
 
+            --wait)
+                QUICKMODE=0
+            ;;
+
             # Warnings
             --warnings-only | --show-warnings-only)
                 SHOW_WARNINGS_ONLY=1
diff --git a/lynis.8 b/lynis.8
index a59be189..712421cf 100644
--- a/lynis.8
+++ b/lynis.8
@@ -1,4 +1,4 @@
-.TH Lynis 8 "24 Jul 2016" "1.23" "Unix System Administrator's Manual"
+.TH Lynis 8 "27 Jul 2016" "1.24" "Unix System Administrator's Manual"
 
 
 .SH "NAME"
@@ -121,6 +121,10 @@ valid options.
 .B \-\-upload
 Upload data to Lynis Enterprise server.
 .TP
+.B \-\-wait
+Wait for user to continue. This adds a break after each section (opposed of
+\-\-quick).
+.TP
 .B \-\-warnings\-only
 Run quietly, except warnings.
 .RE