diff options
| -rw-r--r-- | include/consts | 1 | ||||
| -rw-r--r-- | include/parameters | 5 | ||||
| -rwxr-xr-x | lynis | 12 |
3 files changed, 6 insertions, 12 deletions
diff --git a/include/consts b/include/consts index 0a74814e..1fbc4e9f 100644 --- a/include/consts +++ b/include/consts @@ -159,7 +159,6 @@ unset LANG SHELL_IS_BUSYBOX=0 SHOW_PROGRAM_DETAILS=1 SHOW_REPORT=1 - SHOW_SETTINGS_FILE=0 SHOW_WARNINGS_ONLY=0 SKIP_TESTS="" SKIPPED_TESTS_ROOTONLY="" diff --git a/include/parameters b/include/parameters index ae95755d..7ffb1905 100644 --- a/include/parameters +++ b/include/parameters @@ -126,11 +126,6 @@ CHECK=1 ;; - # Show settings file - --config) - SHOW_SETTINGS_FILE=1 - ;; - # Cronjob support --cronjob | --cron) CRONJOB=1; @@ -88,6 +88,11 @@ Make sure to execute ${PROGRAM_NAME} from untarred directory or check your insta # ################################################################################# # + WORKDIR=`pwd` +# +################################################################################# +# + # Consts # (bin paths, text strings, colors) # @@ -279,12 +284,6 @@ ${NORMAL} PROFILES=`echo ${PROFILES} | sed 's/^ //'` fi - if [ ${SHOW_SETTINGS_FILE} -eq 1 ]; then - echo "Settings file(s): ${PROFILES}" - echo ""; echo "" - ExitClean - fi - # Initialize and check profile file, auditor name, log file and report file if [ "${AUDITORNAME}" = "" ]; then AUDITORNAME="[Not Specified]"; fi if [ "${LOGFILE}" = "" ]; then LOGFILE="/var/log/lynis.log"; fi @@ -590,6 +589,7 @@ ${NORMAL} logtext "Hostname: ${HOSTNAME}" logtext "Auditor: ${AUDITORNAME}" logtext "Profiles: ${PROFILES}" + logtext "Work directory: ${WORKDIR}" logtext "Include directory: ${INCLUDEDIR}" logtext "Plugin directory: ${PLUGINDIR}" logtext "-----------------------------------------------------" |