Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hostinfo for openSUSE:Factory checked in at 2021-03-19 16:42:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hostinfo (Old) and /work/SRC/openSUSE:Factory/.hostinfo.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hostinfo" Fri Mar 19 16:42:54 2021 rev:4 rq:879981 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/hostinfo/hostinfo.changes 2020-12-08 13:26:04.930775591 +0100 +++ /work/SRC/openSUSE:Factory/.hostinfo.new.2401/hostinfo.changes 2021-03-19 16:43:06.634110304 +0100 @@ -1,0 +2,6 @@ +Thu Mar 18 18:57:03 UTC 2021 - jason.rec...@gmail.com + +- Host information now persistent across reboots (bsc#1183732) +- Fixed output strings + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hostinfo.spec ++++++ --- /var/tmp/diff_new_pack.EktmVG/_old 2021-03-19 16:43:08.210112430 +0100 +++ /var/tmp/diff_new_pack.EktmVG/_new 2021-03-19 16:43:08.214112436 +0100 @@ -1,7 +1,7 @@ # # spec file for package hostinfo # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ hostinfo-1.0.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hostinfo-1.0.6/bin/hostinfo new/hostinfo-1.0.6/bin/hostinfo --- old/hostinfo-1.0.6/bin/hostinfo 2020-04-29 19:20:15.934325502 +0200 +++ new/hostinfo-1.0.6/bin/hostinfo 2021-03-18 22:24:17.275911870 +0100 @@ -1,9 +1,9 @@ #!/bin/bash # Description: Displays basic system information -# Modified: 2020 Apr 29 +# Modified: 2021 Mar 18 ############################################################################## -# Copyright (C) 2018-2020 SUSE LLC +# Copyright (C) 2018-2021 SUSE LLC ############################################################################## # # This program is free software; you can redistribute it and/or modify @@ -19,19 +19,19 @@ # along with this program; if not, see <http://www.gnu.org/licenses/>. # # Authors/Contributors: -# Jason Record (jason.rec...@suse.com) +# Jason Record <jason.rec...@suse.com> # ############################################################################## ############################################################################## # Variables ############################################################################## -SVER='1.8.5' +SVER='1.8.7' PAD=25 QUIET=0 FORMAT_OUT="%-${PAD}s %s\n" CONFIG_FILE='/etc/hostinfo.conf' -ISSUE_BASE='/run/issue.d' +ISSUE_BASE='/etc/issue.d' FILE_HOSTINFO='' FILE_BASE="80-hostinfo-" FILE_MOTD="/etc/motd" @@ -60,9 +60,10 @@ ############################################################################## getHelp() { - echo "hostinfo - Gathers host information" + echo "DESCRIPTION: Gathers host information for issue generator and motd" + echo + echo "USAGE: hostinfo [OPTION]" echo - echo "USAGE: hostinfo [command]" echo "OPTIONS" echo " help This help screen" echo " all All commands run (default)" @@ -75,12 +76,13 @@ echo " cpu Show current CPU load information" echo " disk Show list is storage devices and their size" echo ' custom <label> <value> Creates a custom entry' + echo } -getVersion() { - echo - echo " hostinfo v${SVER}" - echo +title() { + echo "#######################################################################" + echo "# hostinfo v${SVER}" + echo "#######################################################################" } getHostname() @@ -163,7 +165,7 @@ FILE_HOSTINFO="${ISSUE_BASE}/${FILE_BASE}06-network" if (( IGNORE_NET )); then rm -f $FILE_HOSTINFO - echo "Network ignored in $CONFIG_FILE" +# echo "Network ignored in $CONFIG_FILE" return 0 else rm -f ${ISSUE_BASE}/70-[be]*conf @@ -267,7 +269,7 @@ FILE_HOSTINFO="${ISSUE_BASE}/${FILE_BASE}05-updates" if (( IGNORE_UPDATES )); then rm -f $FILE_HOSTINFO - echo "System updates ignored in $CONFIG_FILE" +# echo "System updates ignored in $CONFIG_FILE" return 0 fi > $FILE_HOSTINFO @@ -320,7 +322,7 @@ FILE_HOSTINFO="${ISSUE_BASE}/${FILE_BASE}07-memory" if (( IGNORE_MEM )); then rm -f $FILE_HOSTINFO - echo "Memory ignored in $CONFIG_FILE" +# echo "Memory ignored in $CONFIG_FILE" return 0 fi if [[ -x /usr/bin/free ]] @@ -352,7 +354,7 @@ FILE_HOSTINFO="${ISSUE_BASE}/${FILE_BASE}10-disks" if (( IGNORE_DISK )); then rm -f $FILE_HOSTINFO - echo "Disk information ignored in $CONFIG_FILE" +# echo "Disk information ignored in $CONFIG_FILE" return 0 fi echo "Storage Devices" > $FILE_HOSTINFO @@ -368,7 +370,7 @@ FILE_HOSTINFO="${ISSUE_BASE}/${FILE_BASE}08-cpuload" if (( IGNORE_CPULOAD )); then rm -f $FILE_HOSTINFO - echo "CPU load ignored in $CONFIG_FILE" +# echo "CPU load ignored in $CONFIG_FILE" return 0 fi CPU_COUNT=$(grep '^processor' /proc/cpuinfo 2>/dev/null | wc -l) @@ -388,7 +390,7 @@ FILE_HOSTINFO="${ISSUE_BASE}/${FILE_BASE}09-sshkeys" if (( IGNORE_SSHKEYS )); then rm -f $FILE_HOSTINFO - echo "SSH keys ignored in $CONFIG_FILE" +# echo "SSH keys ignored in $CONFIG_FILE" return 0 else rm -f ${ISSUE_BASE}/60-ssh_host_keys.conf @@ -457,21 +459,20 @@ [[ -h 00-OS ]] || ln -sf ${SPACER} 00-OS [[ -h 90-OS ]] || ln -sf ${SPACER} 90-OS case $OPT in - -h|--h*|help) getHelp; cleanUp; exit ;; - dist*) getVersion; getDate; getDistribution ;; - date) getVersion; getDate ;; - host*) getVersion; getDate; getHostname ;; - kern*) getVersion; getDate; getKernel ;; - up*) getVersion; getDate; getUpdates ;; - net*) getVersion; getDate; getNetAddr ;; - mem*) getVersion; getDate; getMemory ;; - disk*) getVersion; getDate; getDisks ;; - cpu*) getVersion; getDate; getCPULoad ;; - ssh*) getVersion; getDate; getSSHKeys ;; - Uninstalled) getVersion; cleanUp; deConfigure ;; - cust*) getVersion; getCustom "$2" "$3";; + -h|--h*|help) title; getHelp; cleanUp; exit ;; + dist*) getDate; getDistribution ;; + date) getDate ;; + host*) getDate; getHostname ;; + kern*) getDate; getKernel ;; + up*) getDate; getUpdates ;; + net*) getDate; getNetAddr ;; + mem*) getDate; getMemory ;; + disk*) getDate; getDisks ;; + cpu*) getDate; getCPULoad ;; + ssh*) getDate; getSSHKeys ;; + Uninstalled) cleanUp; deConfigure ;; + cust*) getCustom "$2" "$3";; all) - getVersion getDistribution getDate getHostname @@ -483,7 +484,7 @@ getSSHKeys getDisks ;; - *) getHelp; getVersion; cleanUp; exit ;; + *) title; getHelp; cleanUp; exit ;; esac cleanUp (( INCLUDE_MOTD )) && putMOTD || :