projects
/
grml-network.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Ulrich Dangel's email address
[grml-network.git]
/
sbin
/
grml-pptp-xdsl-students
diff --git
a/sbin/grml-pptp-xdsl-students
b/sbin/grml-pptp-xdsl-students
index
a57a765
..
e135528
100755
(executable)
--- a/
sbin/grml-pptp-xdsl-students
+++ b/
sbin/grml-pptp-xdsl-students
@@
-17,7
+17,7
@@
export LANG=C
DIALOG="dialog"
export LANG=C
DIALOG="dialog"
-if [
"$UID" != 0 ];
then
+if [
$(id -ru) -ne 0 ] ;
then
sudo $0
exit
fi
sudo $0
exit
fi
@@
-64,7
+64,7
@@
EOF
echo "${VPNUSERNAME} XDSL ${VPNPASSWORD} *" >> /etc/ppp/pap-secrets
chmod 0600 /etc/ppp/pap-secrets
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"
cat >> /etc/init.d/pptp << "EOF"
@@
-125,10
+125,10
@@
if [ -z "$VPNUSERNAME" ] || [ -z "$VPNPASSWORD" ] ; then
exit $1
}
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(){
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
# Card exists but is not configured yet
[ -n "$(iwconfig $1 2>/dev/null | head -1)" ] && return 0
return 1