From 2f96c88b5f05cbda6364e59a0332bcfe82519707 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Feb 2022 22:07:10 +0100 Subject: fai/config/class/{10-*,20-*}: Update from upstream FAI config space. --- fai/config/class/10-base-classes | 2 +- fai/config/class/20-hwdetect.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fai/config/class/10-base-classes b/fai/config/class/10-base-classes index 3d03c8f..d312a50 100755 --- a/fai/config/class/10-base-classes +++ b/fai/config/class/10-base-classes @@ -7,7 +7,7 @@ fi # Echo architecture and OS name in uppercase. Do NOT remove these two lines. uname -s | tr '[:lower:]' '[:upper:]' -[ -x "`which dpkg`" ] && dpkg --print-architecture | tr a-z A-Z +command -v dpkg >&/dev/null && dpkg --print-architecture | tr a-z A-Z # determin if we are a DHCP client or not # count the : chars in the argument of ip= diff --git a/fai/config/class/20-hwdetect.sh b/fai/config/class/20-hwdetect.sh index 8ba48d4..57374c8 100755 --- a/fai/config/class/20-hwdetect.sh +++ b/fai/config/class/20-hwdetect.sh @@ -20,7 +20,8 @@ for mod in $kernelmodules; do modprobe -a $mod 1>/dev/null 2>&1 done -ip ad show up | egrep -iv 'loopback|127.0.0.1|::1/128|_lft' +# show the basic information about the network interface +ip -br li show up|egrep -v ^lo; ip -br a show up|egrep -v ^lo echo $printk > /proc/sys/kernel/printk @@ -32,4 +33,3 @@ if [ "$disklist" != "$odisklist" ]; then fi save_dmesg # save new boot messages (from loading modules) - -- cgit v1.2.3