From e8f0b7a6f51648453d02287f59d169539ac88cb7 Mon Sep 17 00:00:00 2001 From: co Date: Thu, 20 Aug 2020 00:16:08 +0800 Subject: [PATCH] /sbin/ip not found fix & date format fix --- generic-release-1.0/system-info.sh | 10 +++++++--- generic-release.spec | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index 6bfdbed..9f9f7e3 100644 --- a/generic-release-1.0/system-info.sh +++ b/generic-release-1.0/system-info.sh @@ -49,7 +49,11 @@ processes=$(ps aux | wc -l) user_num=$(users | wc -w) # Ip address -ip_pre=$(/sbin/ip a|grep inet|grep -v 127.0.0.1|grep -v inet6 | awk '{print $2}') +ip_pre="" +if [ -x "/sbin/ip" ] +then + ip_pre=$(/sbin/ip a | grep inet | grep -v "127.0.0.1" | grep -v inet6 | awk '{print $2}') +fi echo -e "\n" echo -e "Welcome to $welcome\n" @@ -67,8 +71,8 @@ done echo -e "Users online: \t$user_num" if [ "$whoiam"=="root" ] then - echo -e "\n" + echo -e "\n" else - echo -e "To run a command as administrator(user \"root\"),use \"sudo \"." + echo -e "To run a command as administrator(user \"root\"),use \"sudo \"." fi diff --git a/generic-release.spec b/generic-release.spec index e815a73..fc49fba 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -5,7 +5,7 @@ %define dist_release_version 8 %define generic_version 20.03 %define generic_patch_level LTS -%define generic_release 39 +%define generic_release 40 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -136,10 +136,14 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog +* Thu Aug 20 2020 co - 1.0-40 +- fix bad date format in changelog +- /sbin/ip not found err fix + * Thu Aug 6 2020 zhangrui - 1.0-39 - modify system-info.sh to show more ip address when login -* Fri June 19 2020 shenyangyang - 1.0-38 +* Fri Jun 19 2020 shenyangyang - 1.0-38 - change build requires of python to python3 * Mon May 18 2020 shenyangyang - 1.0-37 -- Gitee