Removed --config option in favor of lynis show profiles

This commit is contained in:
mboelen 2016-04-25 20:04:00 +02:00
parent 4dcb9eccff
commit 7878fad617
3 changed files with 6 additions and 12 deletions

View File

@ -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=""

View File

@ -126,11 +126,6 @@
CHECK=1
;;
# Show settings file
--config)
SHOW_SETTINGS_FILE=1
;;
# Cronjob support
--cronjob | --cron)
CRONJOB=1;

12
lynis
View File

@ -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 "-----------------------------------------------------"