diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2016-07-11 11:32:14 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2016-07-11 11:32:14 +0300 |
| commit | a8d8d40f8892ba4b3638c65944dfb5f2570f8ac0 (patch) | |
| tree | 1926ce0ae844cd0e4a41870bfcbf77d3d1f02e01 | |
| parent | 52317de56c6426539ee21f319a5e0e4195a5eeb7 (diff) | |
Set log date to similar format as normal log entries
| -rwxr-xr-x | lynis | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -32,7 +32,7 @@ PROGRAM_AUTHOR_CONTACT="lynis-dev@cisofy.com" # Version details - PROGRAM_RELEASE_DATE="2016-06-30" + PROGRAM_RELEASE_DATE="2016-07-11" PROGRAM_RELEASE_TIMESTAMP=1467279295 PROGRAM_RELEASE_TYPE="dev" # dev or final PROGRAM_VERSION="2.2.1" @@ -473,7 +473,8 @@ ${NORMAL} ################################################################################# # # Clear log file and test if it's writable - echo "### Starting ${PROGRAM_NAME} ${PROGRAM_VERSION} with PID ${OURPID}, build date ${PROGRAM_RELEASE_DATE} ###" > ${LOGFILE} + CDATE=$(date "+%Y-%m-%d %H:%M:%S") + echo "${CDATE} Starting ${PROGRAM_NAME} ${PROGRAM_VERSION} with PID ${OURPID}, build date ${PROGRAM_RELEASE_DATE}" > ${LOGFILE} if [ $? -gt 0 ]; then Display --indent 2 --text "- Clearing log file (${LOGFILE})... " --result WARNING --color RED echo "${WARNING}Fatal error${NORMAL}: problem while writing to log file. Check location and permissions." @@ -496,6 +497,9 @@ ${NORMAL} Report "os_fullname=${OS_FULLNAME}" Report "os_version=${OS_VERSION}" if [ "${OS}" = "Linux" ]; then Report "linux_version=${LINUX_VERSION}"; fi + if [ ! -z "${OS_KERNELVERSION}" ]; then Report "os_kernel_version=${OS_KERNELVERSION}"; fi + if [ ! -z "${OS_KERNELVERSION_FULL}" ]; then Report "os_kernel_version_full=${OS_KERNELVERSION_FULL}"; fi + Report "hostname=${HOSTNAME}" if [ "${HOSTNAME}" = "" ]; then |