[PATCH] tests: use proper admin group in start.sh
Michal Kazior
michal.kazior
Thu Nov 7 23:13:14 PST 2013
wpa_supplicant configuration files had a hardcoded
GROUP=admin. The start.sh script failed on a
system without admin group (some systems have
it named adm).
Generate configuration files with appropriate
GROUP in the log dir and use them.
Signed-hostap: Michal Kazior <michal.kazior at tieto.com>
---
tests/hwsim/start.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh
index 02d99bf..bf55c1a 100755
--- a/tests/hwsim/start.sh
+++ b/tests/hwsim/start.sh
@@ -21,9 +21,14 @@ else
GROUP=adm
fi
+sed "s/ GROUP=.*$/ GROUP=$GROUP/" "$DIR/sta-dummy.conf" > "$LOGDIR/sta-dummy.conf"
+for i in 0 1 2; do
+ sed "s/ GROUP=.*$/ GROUP=$GROUP/" "$DIR/p2p$i.conf" > "$LOGDIR/p2p$i.conf"
+done
+
if [ "$1" = "concurrent" ]; then
CONCURRENT=y
- CONCURRENT_ARGS="-N -Dnl80211 -ista%d -c $DIR/sta-dummy.conf"
+ CONCURRENT_ARGS="-N -Dnl80211 -ista%d -c $LOGDIR/sta-dummy.conf"
shift
else
unset CONCURRENT
@@ -61,7 +66,7 @@ mkdir -p $LOGDIR
sudo ifconfig hwsim0 up
sudo $WLANTEST -i hwsim0 -n $LOGDIR/hwsim0.pcapng -c -d > $LOGDIR/hwsim0 &
for i in 0 1 2; do
- sudo $(printf -- "$VALGRIND_WPAS" $i) $WPAS -g /tmp/wpas-wlan$i -G$GROUP -Dnl80211 -iwlan$i -c $DIR/p2p$i.conf \
+ sudo $(printf -- "$VALGRIND_WPAS" $i) $WPAS -g /tmp/wpas-wlan$i -G$GROUP -Dnl80211 -iwlan$i -c $LOGDIR/p2p$i.conf \
$(printf -- "$CONCURRENT_ARGS" $i) -ddKt$TRACE -f $LOGDIR/log$i &
done
sudo $VALGRIND_HAPD $HAPD -ddKt$TRACE -g /var/run/hostapd-global -G $GROUP -ddKt -f $LOGDIR/hostapd &
--
1.8.4.rc3
More information about the Hostap
mailing list