From e18bc5ab5c41bf8ce964b041c11c2c3906e896a9 Mon Sep 17 00:00:00 2001 From: ub1x Date: Tue, 2 Nov 2021 21:15:13 +0100 Subject: [PATCH] Improved CheckKernel.sh based on /etc/os-releases and updated README --- CheckKernel.sh | 86 +++++++++++++++++++++++++++----------------------- README.md | 12 ++++--- 2 files changed, 53 insertions(+), 45 deletions(-) diff --git a/CheckKernel.sh b/CheckKernel.sh index bab18c7..14d9ad1 100755 --- a/CheckKernel.sh +++ b/CheckKernel.sh @@ -2,20 +2,15 @@ # CheckKernel checks if Kernel was updated and not aktivated (rebooted) # # (c) GPL by Ulf Bartholomäus ub1x@gmx.net -VERSION="$( basename $0 ) Version 0.2.3 from 12.7.2021" +VERSION="$( basename $0 ) Version 0.2.4 from 02.11.2021" # -# Input: 1 parameter optional ("-d" = debug and "-v" = verbose / "-D" = Distro only / "-K" = running KernelVerion / "-N" = New Kernel Version) +# Input: 1 parameter optional ("-d" = debug and "-v" = verbose / "-D" = Distro only / "-DV" = Distro and release only / "-K" = running KernelVerion / "-N" = New Kernel Version) # Output: text messages and a kdialog if this is installed # Returnvalue: 0 if Kernel OK and 10 if Kernel is changed # -# ToDo: Check if initrd and vmlinuz exists -# cat /etc/issue -# cat /proc/version -# Error: inxi - hangs in a script: -# MyDistro="$( eval inxi -xSz | grep Distro: | awk -F'Distro: ' '{print $2}' )" -# https://github.com/smxi/inxi/issues/181 # # Changes: +# 0.2.4: Change way to collect Distro Name from /etc/os-releas (if empty - provide old info) # 0.2.3: Fix error => update in case only one Kernel is avaialble # 0.2.2: Fix error => new Kernel update: replace initrd with vmlinuz check # 0.2.1: added -D -K and -N option @@ -23,12 +18,12 @@ VERSION="$( basename $0 ) Version 0.2.3 from 12.7.2021" # 0.2.0: InitKernel und VmlzKernel entfernt, # [ $( ls -1 /boot/ | grep initrd- | wc -l ) -gt 1 ] && echo "** Error" || ls -1 /boot/ | grep initrd- | cut -d '-' -f 2,3,4 # Some small changes and simplifications -# 0.1.9: NewKernel erneut angepasstsys -# 0.1.8: "==" -> "=" sowie kleinere Shönheitskorrekturen - sowie NewKernel mit awk statt cut +# 0.1.9: InitKernel erneut angepasstsys +# 0.1.8: "==" -> "=" sowie kleinere Shönheitskorrekturen - sowie InitKernel mit awk statt cut # 0.1.7: remove "CheckKernel.sh: Zeile 33: lsb_release: Kommando nicht gefunden." # and => -d = debaug # 0.1.6: if "lsb_release" not available use "cat /etc/*-release" info -# 0.1.5: Fix trouble if NewKernel is empty +# 0.1.5: Fix trouble if InitKernel is empty # 0.1.4: Fix some errors # 0.1.3: Fix running and new kernel are equal but shown as different # 0.1.2: Remove "initrd-" from InitKernel @@ -44,11 +39,11 @@ VERSION="$( basename $0 ) Version 0.2.3 from 12.7.2021" # 0.0.1: generation # -DEBUG="" -MyDistro="" -MyKernel="" -NewKernel="" -InitKernel="" +DEBUG="" # Debug mode ="1" +MyDistro="" # Name of the Distro +MyDstVer="" # Distro Version info +MyKernel="" # Running Kernel Version +InitKernel="" # Newest Kernel at initrd if [ $# -gt 0 ] && [ "$1" = "-d" ] ; then DEBUG="1" @@ -56,16 +51,38 @@ if [ $# -gt 0 ] && [ "$1" = "-d" ] ; then shift fi -MyDistro="$( cat /proc/version )" -MyDistro="${MyDistro/*;/}" # remove first string till ";" -MyDistro="${MyDistro/)*/}" # remove anything behind ")" -MyDistro="${MyDistro/# /}" # remove blanks in the beginning +if [ -e /etc/os-release ]; then + MyDistro="$( grep PRETTY_NAME /etc/os-release )" + MyDistro="${MyDistro/*=\"/}" # remove first string till =" + MyDistro="${MyDistro/\"*/}" # remove " + MyDstVer="$( grep VERSION_ID /etc/os-release )" + MyDstVer="${MyDstVer/*=\"/}" # remove first string till =" + MyDstVer="(${MyDstVer/\"*/})" # remove " +fi + +if [ -z "${MyDistro}" ] && [ -e /proc/version ]; then + MyDistro="$( cat /proc/version )" + MyDistro="${MyDistro/*;/}" # remove first string till ";" + MyDistro="${MyDistro/)*/}" # remove anything behind ")" + MyDistro="${MyDistro/# /}" # remove blanks in the beginning + echo -n "Version ${MyDistro} | " +fi if [ $# -gt 0 ] && [ "$1" = "-D" ] ; then echo "${MyDistro}" exit fi +if [ $# -gt 0 ] && [ "$1" = "-DV" ] ; then + echo "${MyDistro} ${MyDstVer}" + exit +fi + +if [ $# -gt 0 ] && [ "$1" = "-V" ] ; then + echo "${MyDstVer}" + exit +fi + MyKernel="$( uname -r )" if [ $# -gt 0 ] && [ "$1" = "-K" ] ; then @@ -74,43 +91,32 @@ if [ $# -gt 0 ] && [ "$1" = "-K" ] ; then fi InitKernel="$( ls -1tr /boot/ | grep 'vmlinuz-' )" -if [ $( echo "${InitKernel}" | wc -l ) -ge 1 ] ; then - # If To much Kernels - exit - # use only the last listed kernel (hopfully the newest) - NewKernel="${InitKernel/*vmlinuz-/}" -else - # no "vmlinuz" entry - [ ${DEBUG} ] && echo "** Error: /boot/vmlinuz-* is missing <${InitKernel}>" -# exit 10 - NewKernel="Missing /boot/vmlinuz-*" +if [ -n "${InitKernel}" ] ; then + InitKernel="${InitKernel/*vmlinuz-/}" fi if [ $# -gt 0 ] && [ "$1" = "-N" ] ; then - echo "${NewKernel}" + echo "${InitKernel}" exit fi -if [ ${DEBUG} ] ; then - echo -e "* Debug Info *\n\t MyDistro=${MyDistro},\n\t MyKernel=${MyKernel},\n\t InitKernel=${InitKernel},\n\t NewKernel=${NewKernel}!" - [ "x${MyKernel}" = "x${NewKernel}" ] && echo -e "*\t(${MyKernel}) = (${NewKernel})" || echo -e "***\t(${MyKernel}) != ${NewKernel} !!!" - echo "*" -fi -if [ "x${MyKernel}" = "x${NewKernel}" ] ; then +if [ "${MyKernel}" = "${InitKernel}" ] ; then if [ $# -gt 0 ] && [ "$1" = "-v" ] ; then - echo -e "\t*** Distro: ${MyDistro} \tKernel ${MyKernel} \t$( date "+%X / %d.%m.%Y" ) \t*** Kernel OK ***" + echo -e "\t*** $( date "+%X / %d.%m.%Y" ) \tDistro: ${MyDistro} ${MyDstVer} \tKernel: ${MyKernel} \t*** Kernel OK ***" else echo "*** Kernel OK (${MyKernel})"; fi else - if ( [ $# -gt 0 ] && [ "$1" == "-v" ] ) ; then - echo -e "\t*** Distro: ${MyDistro} \tKernel ${MyKernel} \t$( date "+%X / %d.%m.%Y" ) \t*** NEW Kernel ${NewKernel}!!! ***" + if ( [ $# -gt 0 ] && [ "$1" = "-v" ] ) ; then + echo -e "\t*** $( date "+%X / %d.%m.%Y" ) \tDistro: ${MyDistro} ${MyDstVer} \tKernel: ${MyKernel} \t*** NEW Kernel ${InitKernel}!!! ***" else - MsgTxt="*** Kernel Updated from ${MyKernel} to ${NewKernel}! => please reboot" + MsgTxt="*** Kernel Updated from ${MyKernel} to ${InitKernel}! => please reboot" echo "${MsgTxt}"; logger -t $( basename $0 ) "${MsgTxt}" if [ $# -eq 0 ] && [ -e $( which kdialog 2>> /dev/null ) ] ; then kdialog --title "*** $( hostname ) ***" --error "${MsgTxt}" >> /dev/null 2>> /dev/null fi fi + exit 10 fi diff --git a/README.md b/README.md index 9fd6f7d..9c84543 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,14 @@ See also at [LUG-VS-Wiki Nützliche Scripte](https://lug-vs.org//lugvswiki/index |Script|Description| |---|---| +|[CheckKernel.sh](CheckKernel.sh)|Show some Kernel information (supports -d for debug und -v for verbose)| +|[dfc.sh](dfc.sh)|Script shows the free memory of all mounted file systems beside *tmpfs traffic light colored| |[duc-index.sh](duc-index.sh)|Script to be added e.g. as cronjob, which generate an index w/o NFS and DavFS file system mounted files| -|[dfc.sh](dfc.sh)|Script shows the free memory of all mounted file systems beside *tmpfs| |[make_exif-name.sh](make_exif-name.sh)|Add a comment in all *.jpg files in the actual and all subfolders| -|[write-exif-comment.sh](write-exif-comment.sh)|Write JPEG EXIF comment in all *.jpg files| -|[utf8.sh](utf8.sh)|Convert text from e.g. Windows latin1 to utf8 text (e.g. in READMEs or other text (not for office documents))| +|[SavePC.sh](SavePC.sh)|Save some helpfull settings (not /home) and some general informatin| |[SchredderHDD.sh](SchredderHDD.sh)|Delete a mechanical Hard Disk (HDD) reliably to ensure before forward it to the recycling, that no old data are there| +|[utf8.sh](utf8.sh)|Convert text from e.g. Windows latin1 to utf8 text (e.g. in READMEs or other text (not for office documents))| |[wmf2svg.sh](wmf2svg.sh)|Example script converts WMF files in SVG to share it easily on the internet| -|[SavePC.sh](SavePC.sh)|Save some helpfull settings (not /home) and some general informatins| -|[CheckKernel.sh](CheckKernel.sh)|Show some intersting Kernel informations (supports -d for debug und -v for verbose)| +|[write-exif-comment.sh](write-exif-comment.sh)|Write JPEG EXIF comment in all *.jpg files| + +