DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: vm: Simplify parameter passing

Browse source 
Since the kernel  actually passes the command-line parameters
as environment variables to the init script, there's no need
to parse them out of /proc/cmdline.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2022-07-12 23:44:19 +02:00 • committed by Jouni Malinen
parent 6f90aa5a63
commit 550ab94e83
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/hwsim/vm/inside.sh
View file

@ -30,19 +30,6 @@ export HOME=/tmp
sysctl kernel.panic_on_oops=1 sysctl kernel.panic_on_oops=1
sysctl kernel.panic=1 sysctl kernel.panic=1
# get extra command line variables from /proc/cmdline
TESTDIR=$(sed 's/.*testdir=\([^ ]*\) .*/\1/' /proc/cmdline)
TIMEWARP=$(sed 's/.*timewarp=\([^ ]*\) .*/\1/' /proc/cmdline)
EPATH=$(sed 's/.*EPATH=\([^ ]*\) .*/\1/' /proc/cmdline)
TELNET=$(sed 's/.*TELNET=\([^ ]*\) .*/\1/' /proc/cmdline)
ARGS=$(sed 's/.*ARGS=\([^ ]*\)\( \|$\).*/\1/' /proc/cmdline)
LOGDIR=$(sed 's/.*LOGDIR=\([^ ]*\)\( \|$\).*/\1/' /proc/cmdline)
if grep -q "commitid=" /proc/cmdline; then
COMMITID=$(sed 's/.*commitid=\([^ ]*\)\( \|$\).*/\1/' /proc/cmdline)
else
COMMITID=
fi
mount --bind "$TESTDIR/vm/regdb/" /lib/firmware mount --bind "$TESTDIR/vm/regdb/" /lib/firmware
if [ "$MODULEDIR" != "" ] ; then if [ "$MODULEDIR" != "" ] ; then

6
tests/hwsim/vm/vm-run.sh
View file

@ -148,8 +148,8 @@ A+="cfg80211.dyndbg=+p "
A+="mac80211.dyndbg=+p " A+="mac80211.dyndbg=+p "
A+="mac80211_hwsim.dyndbg=+p " A+="mac80211_hwsim.dyndbg=+p "
A+="init=$CMD " A+="init=$CMD "
A+="testdir=$TESTDIR " A+="TESTDIR=$TESTDIR "
A+="timewarp=$TIMEWARP " A+="TIMEWARP=$TIMEWARP "
A+="MODULEDIR=$MODULEDIR " A+="MODULEDIR=$MODULEDIR "
A+="TELNET=$TELNET_ARG " A+="TELNET=$TELNET_ARG "
A+="EPATH=$EPATH " A+="EPATH=$EPATH "
@ -157,7 +157,7 @@ A+="ARGS=$argsfile "
A+="console=$KVMOUT " A+="console=$KVMOUT "
COMMITID="$(git rev-parse HEAD)" COMMITID="$(git rev-parse HEAD)"
if [ -n "$COMMITID" ]; then if [ -n "$COMMITID" ]; then
A+="commitid=$COMMITID " A+="COMMITID=$COMMITID "
fi fi
A+="ro" A+="ro"