X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=sbin%2Fgrml-pptp-xdsl-students;h=e13552864debbd821d8aa6e29df28b6cd3ef6bf9;hb=31498de4acd8c9fc4756baaec0d4077508c7d923;hp=a57a7656f5bf621da33e94db7dd78bc29bc06cf1;hpb=5ccffd6ee849bb7c004e464f3972bcce22beac7c;p=grml-network.git

diff --git a/sbin/grml-pptp-xdsl-students b/sbin/grml-pptp-xdsl-students
index a57a765..e135528 100755
--- a/sbin/grml-pptp-xdsl-students
+++ b/sbin/grml-pptp-xdsl-students
@@ -17,7 +17,7 @@
 export LANG=C
 DIALOG="dialog"
 
-if [ "$UID" != 0 ];  then
+if [ $(id -ru) -ne 0 ] ; then
   sudo $0
   exit
 fi
@@ -64,7 +64,7 @@ EOF
 echo "${VPNUSERNAME} XDSL ${VPNPASSWORD} *" >> /etc/ppp/pap-secrets
 chmod 0600 /etc/ppp/pap-secrets
 
-echo -e "#!/bin/sh\nLANG=C\nVPNSERVER=\"${VPNSERVER}\"\n" > /etc/init.d/pptp
+printf "#!/bin/sh\nLANG=C\nVPNSERVER=\"${VPNSERVER}\"\n" > /etc/init.d/pptp
 
 cat >> /etc/init.d/pptp << "EOF"
 
@@ -125,10 +125,10 @@ if [ -z "$VPNUSERNAME" ] || [ -z "$VPNPASSWORD" ] ; then
   exit $1
   }
 
-  NETDEVICES="$(cat /proc/net/dev | awk -F: '/[0-9]:/{print $1}')"
+  NETDEVICES="$(grep -ve 'lo:' -ve 'Inter-|' -ve 'face |bytes' /proc/net/dev | awk -F: '{print $1}')"
 
   wireless(){
-   case "$(cat /proc/net/wireless 2>/dev/null)" in *$1*) return 0;; esac
+   [ -d "/sys/class/net/${1}/wireless" ] && return 0
    # Card exists but is not configured yet
    [ -n "$(iwconfig $1 2>/dev/null | head -1)" ] && return 0
    return 1