Hello community, here is the log from the commit of package hostinfo for openSUSE:Factory checked in at 2018-03-12 12:11:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hostinfo (Old) and /work/SRC/openSUSE:Factory/.hostinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hostinfo" Mon Mar 12 12:11:48 2018 rev:2 rq:585338 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hostinfo/hostinfo.changes 2018-03-09 10:47:26.668844387 +0100 +++ /work/SRC/openSUSE:Factory/.hostinfo.new/hostinfo.changes 2018-03-12 12:11:50.411219096 +0100 @@ -1,0 +2,6 @@ +Sat Mar 10 17:55:17 UTC 2018 - jason.rec...@suse.com + +- Added 91-hostinfo.rules for network rules +- Add INCLUDE_MOTD for message of the day + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hostinfo.spec ++++++ --- /var/tmp/diff_new_pack.Vmo6w6/_old 2018-03-12 12:11:51.559178142 +0100 +++ /var/tmp/diff_new_pack.Vmo6w6/_new 2018-03-12 12:11:51.563177999 +0100 @@ -12,18 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + Name: hostinfo Version: 1.0 Release: 0 Summary: Gathers basic server information License: GPL-2.0 -URL: https://github.com/g23guy/hostinfo Group: System/Monitoring +Url: https://github.com/g23guy/hostinfo Source: %{name}-%{version}.tar.gz -Requires: sed Requires: iproute2 Requires: issue-generator -Buildarch: noarch +Requires: sed +BuildArch: noarch %description A script that displays current system information to help @@ -40,10 +44,11 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_unitdir} -mkdir -p %{buildroot}%{_presetdir} +mkdir -p %{buildroot}%{_udevrulesdir} install -d %{buildroot}%{_mandir}/man8 install -d %{buildroot}%{_docdir}/%{name} install -m 644 conf/hostinfo.conf %{buildroot}%{_sysconfdir} +install -m 644 conf/91-hostinfo.rules %{buildroot}%{_udevrulesdir}/91-hostinfo.rules install -D -m 644 conf/hostinfo.service %{buildroot}%{_unitdir}/hostinfo.service install -D -m 644 conf/hostinfo.timer %{buildroot}%{_unitdir}/hostinfo.timer install -m 755 bin/hostinfo %{buildroot}%{_sbindir} @@ -57,13 +62,14 @@ %{_sbindir}/rchostinfo %{_unitdir}/hostinfo.service %{_unitdir}/hostinfo.timer +%{_udevrulesdir}/91-hostinfo.rules %config %{_sysconfdir}/hostinfo.conf %{_mandir}/man8/* %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/* %pre -%service_add_pre hostinfo.service hostinfo.timer +%service_add_pre hostinfo.service hosinfo.timer %post %service_add_post hostinfo.service hostinfo.timer ++++++ hostinfo-1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hostinfo-1.0/bin/hostinfo new/hostinfo-1.0/bin/hostinfo --- old/hostinfo-1.0/bin/hostinfo 2018-03-08 19:21:23.503940401 +0100 +++ new/hostinfo-1.0/bin/hostinfo 2018-03-10 19:06:05.420212175 +0100 @@ -1,6 +1,6 @@ #!/bin/bash # Description: Displays basic system information -# Modified: 2018 Mar 08 +# Modified: 2018 Mar 10 ############################################################################## # Copyright (C) 2018 SUSE LLC @@ -26,7 +26,7 @@ ############################################################################## # Variables ############################################################################## -SVER='1.7.20' +SVER='1.7.25' PAD=25 QUIET=0 FORMAT_OUT="%-${PAD}s %s\n" @@ -38,6 +38,7 @@ ERR_MISSING_CONFIG=2 ERR_CUSTOM_LIMIT_EXCEEDED=3 ERR_HOSTINFO_ACTIVE=4 +SCRIPT_NAME="${0##*/}" trap deConfigure SIGTERM @@ -78,7 +79,7 @@ getHostname() { FILE_HOSTINFO="${ISSUE_BASE}/${FILE_BASE}03-host" - printf "$FORMAT_OUT" "Hostname:" "\n" > $FILE_HOSTINFO + printf "$FORMAT_OUT" "Hostname:" "$HOSTNAME" > $FILE_HOSTINFO } getDate() @@ -147,8 +148,8 @@ KERN_TAINT_STR="Not Tainted" fi - printf "$FORMAT_OUT" "Kernel Version:" "\r" >> $FILE_HOSTINFO - printf "$FORMAT_OUT" " Architecture:" "\m" >> $FILE_HOSTINFO + printf "$FORMAT_OUT" "Kernel Version:" "$(uname -r)" >> $FILE_HOSTINFO + printf "$FORMAT_OUT" " Architecture:" "$(uname -m)" >> $FILE_HOSTINFO printf "$FORMAT_OUT" " Installed:" "$KERN_DATE_STR" >> $FILE_HOSTINFO printf "$FORMAT_OUT" " Status:" "$KERN_TAINT_STR" >> $FILE_HOSTINFO } @@ -399,11 +400,16 @@ rm -f $HOSTINFO_PID } +putMOTD() { + cp /etc/issue /etc/motd +} + deConfigure() { rm -f /run/issue.d/80-hostinfo-* rm -f /run/issue.d/00-OS rm -f /run/issue.d/90-OS /usr/sbin/issue-generator + > /etc/motd exit 0 } @@ -448,4 +454,5 @@ *) getHelp; cleanUp; exit ;; esac cleanUp +(( INCLUDE_MOTD )) && putMOTD || : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hostinfo-1.0/conf/91-hostinfo.rules new/hostinfo-1.0/conf/91-hostinfo.rules --- old/hostinfo-1.0/conf/91-hostinfo.rules 1970-01-01 01:00:00.000000000 +0100 +++ new/hostinfo-1.0/conf/91-hostinfo.rules 2018-03-10 18:09:45.009140709 +0100 @@ -0,0 +1,2 @@ +ACTION=="add", SUBSYSTEM=="net", RUN+="/usr/sbin/hostinfo network" +ACTION=="remove", SUBSYSTEM=="net", RUN+="/usr/sbin/hostinfo network" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hostinfo-1.0/conf/hostinfo.conf new/hostinfo-1.0/conf/hostinfo.conf --- old/hostinfo-1.0/conf/hostinfo.conf 2018-02-21 20:31:52.630704237 +0100 +++ new/hostinfo-1.0/conf/hostinfo.conf 2018-03-09 21:19:00.630614359 +0100 @@ -1,11 +1,19 @@ # hostinfo initialization file # +# Name: INCLUDE_MOTD +# Description: When set to 1, /etc/issue is copied to /etc/motd +# Values: 0 or 1 +# Default: 0 +# +INCLUDE_MOTD=0 + +# # Name: IGNORE_DISK # Description: When set to 1, hostinfo excludes disk information # Values: 0 or 1 -# Default: 0 +# Default: 1 # -IGNORE_DISK=0 +IGNORE_DISK=1 # Name: IGNORE_MEM # Description: When set to 1, hostinfo excludes memory information @@ -38,7 +46,7 @@ # Name: IGNORE_SSHKEYS # Description: When set to 1, hostinfo excludes host ssh key fingerprint information # Values: 0 or 1 -# Default: 0 +# Default: 1 # -IGNORE_SSHKEYS=0 +IGNORE_SSHKEYS=1
