From 43d6e39757e77bb9402b936859920ef1b3370f86 Mon Sep 17 00:00:00 2001
From: Zeno Zeng <zenoofzeng@gmail.com>
Date: Wed, 15 Oct 2014 16:35:07 +0800
Subject: [PATCH] wlan.sh now uses xl2tpd.conf

---
 lib/user.sh | 4 ++--
 lib/wlan.sh | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/user.sh b/lib/user.sh
index 84f750b..1856fbc 100755
--- a/lib/user.sh
+++ b/lib/user.sh
@@ -62,7 +62,7 @@ case "$1" in
     # Get a user
     # @private
     get)
-        count=$(ls -1A $users_enabled | wc -l)
+        count=$(getall | wc -l)
         if [ "${count}" -eq "0" ]; then
             echo "No user found. Use 'zjunet user add' to add a user."
             exit 1
@@ -71,7 +71,7 @@ case "$1" in
                 users=$(getall)
                 read -p "Choose User [ ${users}]: " username
             else
-                username=$(ls -1 $users_enabled | head -n1)
+                username=$(getall | head -n1)
             fi
             echo $username
         fi
diff --git a/lib/wlan.sh b/lib/wlan.sh
index a874028..573aed7 100755
--- a/lib/wlan.sh
+++ b/lib/wlan.sh
@@ -83,6 +83,7 @@ case "$1" in
     *)
         login $USERNAME $PASSWORD
         ;;
-
-    "${BASEDIR}/sudo.sh" "${BASEDIR}/route.sh"
 esac
+
+"${BASEDIR}/sudo.sh" "${BASEDIR}/route.sh"
+