kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

znetconf: introduce better ways to locate udevadm

Browse Source 
When udevadm is going to be used, try to locate it
in $PATH and if it fails, try to locate it in well-known
binary paths.

Signed-off-by: Guevenc Guelce <guvenc@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Guevenc Guelce
2020-07-08 18:31:34 +02:00
committed by Jan Höppner
parent 943c5dc51d
commit 1003d81412
1 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
zconf/znetconf
View File

@@ -63,14 +63,8 @@ CMD=$(basename $0)
LSZNET=/lib/s390-tools/lsznet.raw
LSZNET_ARGS=-a
LSZNET_CALL="$LSZNET $LSZNET_ARGS"
UDEVSETTLE=/sbin/udevadm
if [ ! -e $UDEVSETTLE ]
then
UDEVSETTLE=/sbin/udevsettle
UDEVSETTLE_CALL="$UDEVSETTLE --timeout=10"
else
UDEVSETTLE_CALL="$UDEVSETTLE settle --timeout=10"
fi
UDEVSETTLE=udevadm
UDEVSETTLE_CALL="$UDEVSETTLE settle --timeout=10"
SYSFSDIR=$(cat /proc/mounts|awk '$3=="sysfs"{print $2; exit}')
CCWGROUPBUS_DIR=$SYSFSDIR/bus/ccwgroup
CCWDEV_DIR=$SYSFSDIR/bus/ccw/devices
@@ -261,6 +255,35 @@ function lookup_lan_layer()
#==============================================================================
function prepare_udevsettle_cmd()
{
# is the command available in $PATH
if ! [ -x "$(command -v $UDEVSETTLE)" ]
then
# check the well known locations.
if [ -e "/sbin/udevadm" ]
then
UDEVSETTLE=/sbin/udevadm
UDEVSETTLE_CALL="$UDEVSETTLE settle --timeout=10"
elif [ -e "/usr/bin/udevadm" ]
then
UDEVSETTLE=/usr/bin/udevadm
UDEVSETTLE_CALL="$UDEVSETTLE settle --timeout=10"
elif [ -e "/sbin/udevsettle" ]
then
# Fallback to udevsettle
UDEVSETTLE=/sbin/udevsettle
UDEVSETTLE_CALL="$UDEVSETTLE --timeout=10"
else
UDEVSETTLE=""
UDEVSETTLE_CALL=""
echo "Failed to find any candidate for udevsettle"
fi
fi
}
#==============================================================================
function lookup_type_and_lan_or_vswitch_name()
{
local DEVNO="$1"
@@ -506,8 +529,9 @@ function wait_for_net_device()
local CMD_FINDNETLINK="find $CCWGROUPBUS_DEVICEDIR/$CCWGROUPDEVNO/ -type l -name net*"
local LINKNAME=""
prepare_udevsettle_cmd
# polling loop to wait for net device to become available
if [ -e $UDEVSETTLE ]
if [ "$UDEVSETTLE" != "" ]
then
$UDEVSETTLE_CALL
fi