From dd6c0333260fe496cfeedc361731f1a721db071e Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 28 Oct 2006 00:28:30 +0200 Subject: [PATCH] * Split out network related scripts into package grml-network, depend on it therefore. * Another cleanup of debian/rules. * Added XS-X-Vcs-Hg: header to debian/control, see http://www.bononia.it/~zack/blog/posts/xs-x-vcs-XXX.html --- debian/changelog | 10 ++ debian/control | 3 +- debian/overrides | 1 - debian/rules | 21 +--- net-functions | 30 ------ routersetup | 28 ----- usr_sbin/grml-ap | 215 --------------------------------------- usr_sbin/grml-bridge | 146 -------------------------- usr_sbin/grml-network | 181 -------------------------------- usr_sbin/grml-pptp-inode | 117 --------------------- usr_sbin/grml-pptp-vcgraz | 150 --------------------------- usr_sbin/grml-pptp-xdsl-students | 172 ------------------------------- usr_sbin/grml-router | 90 ---------------- usr_sbin/grml-vpnc-tugraz | 118 --------------------- usr_share/include | 14 --- 15 files changed, 15 insertions(+), 1281 deletions(-) delete mode 100644 net-functions delete mode 100644 routersetup delete mode 100755 usr_sbin/grml-ap delete mode 100755 usr_sbin/grml-bridge delete mode 100755 usr_sbin/grml-network delete mode 100755 usr_sbin/grml-pptp-inode delete mode 100755 usr_sbin/grml-pptp-vcgraz delete mode 100755 usr_sbin/grml-pptp-xdsl-students delete mode 100755 usr_sbin/grml-router delete mode 100755 usr_sbin/grml-vpnc-tugraz delete mode 100644 usr_share/include diff --git a/debian/changelog b/debian/changelog index 7f7e1c2..868818d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +grml-scripts (0.8-26) unstable; urgency=low + + * Split out network related scripts into package grml-network, + depend on it therefore. + * Another cleanup of debian/rules. + * Added XS-X-Vcs-Hg: header to debian/control, see + http://www.bononia.it/~zack/blog/posts/xs-x-vcs-XXX.html + + -- Michael Prokop Sat, 28 Oct 2006 00:23:41 +0200 + grml-scripts (0.8-25) unstable; urgency=low * Added new hostnames to random-hostname, thanks Filippo Cattaneo. diff --git a/debian/control b/debian/control index 133a97c..07bb0e1 100644 --- a/debian/control +++ b/debian/control @@ -4,10 +4,11 @@ Priority: optional Maintainer: Michael Prokop Build-Depends: debhelper (>= 4.0.0), dietlibc-dev Standards-Version: 3.7.2 +XS-X-Vcs-Hg: http://hg.grml.org/grml-scripts Package: grml-scripts Architecture: any -Depends: dialog, perl, zsh, dash, w3m | links | links2, screen, console-tools | xbase-clients +Depends: dialog, perl, zsh, dash, w3m | links | links2, screen, console-tools | xbase-clients, grml-network Suggests: ruby, python, grml-x, ipcalc, hwinfo, antiword, grml-etc, grml-rebuildfstab, grml-scanpartitions, grml-files, grml-hwinfo, grml-saveconfig, pptp-linux, flite, wmii, mutt | mutt-ng, slrn, grml-docs, grml-autoconfig (>= 0.5-10) Conflicts: scanmodem, grml-etc-core (<< 0.1-6) Description: some small scripts which should make life easier diff --git a/debian/overrides b/debian/overrides index 3356a03..d6f3db8 100644 --- a/debian/overrides +++ b/debian/overrides @@ -1,6 +1,5 @@ grml-scripts: shell-script-fails-syntax-check ./usr/bin/grml-lock grml-scripts: shell-script-fails-syntax-check ./usr/sbin/grml-nessus -grml-scripts: shell-script-fails-syntax-check ./usr/sbin/grml-pptp-vcgraz grml-scripts: executable-not-elf-or-script ./usr/bin/tinyp2p.py grml-scripts: executable-not-elf-or-script ./usr/bin/wwwis grml-scripts: executable-not-elf-or-script ./usr/bin/exifinfo diff --git a/debian/rules b/debian/rules index f0bfd7e..a4c220a 100755 --- a/debian/rules +++ b/debian/rules @@ -6,16 +6,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - build: build-stamp -build-stamp: configure-stamp +build-stamp: dh_testdir cd $(CURDIR)/compile/ && make touch build-stamp @@ -23,7 +16,7 @@ build-stamp: configure-stamp clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp + rm -f build-stamp # Add here commands to clean up after the build process. rm -rf $(CURDIR)/debian/grml-scripts/ @@ -50,8 +43,6 @@ install: build install -m 755 compile/dpkg_not_running debian/grml-scripts/usr/sbin/dpkg_not_running install -m 755 compile/reread_partition_table debian/grml-scripts/usr/sbin/reread_partition_table install -m 644 script-functions debian/grml-scripts/etc/grml/script-functions - install -m 644 net-functions debian/grml-scripts/etc/grml/net-functions - install -m 644 routersetup debian/grml-scripts/etc/grml/routersetup # Build architecture-independent files here. binary-indep: build install @@ -64,8 +55,7 @@ binary-arch: build install dh_installchangelogs dh_installdocs dh_installman manpages/grml-scripts.1 manpages/grml-bind.8 manpages/reread_partition_table.8 manpages/gtf.1 manpages/random-hostname.1 \ - manpages/grml-setkeyboard.8 manpages/grml-setlang.8 manpages/getsf.1 manpages/grml-router.8 manpages/grml-ap.8 manpages/grml-bridge.8 \ - manpages/grml-iptstate.8 + manpages/grml-setkeyboard.8 manpages/grml-setlang.8 manpages/getsf.1 manpages/grml-iptstate.8 # cp --no-dereference man/*.1.gz debian/grml-scripts/usr/share/man/man1/ dh_link /usr/sbin/blacklist /usr/sbin/unblacklist dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/align.1.gz @@ -107,18 +97,13 @@ binary-arch: build install dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-mutt.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-muttng.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-nessus.1.gz - dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-network.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-postfix.1.gz - dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-pptp-inode.1.gz - dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-pptp-vcgraz.1.gz - dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-pptp-xdsl-students.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-screen.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-lang.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-resolution.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-slrn.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-start.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-tpm.1.gz - dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/grml-vpnc-tugraz.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/hgrep.sh.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/iimage.1.gz dh_link /usr/share/man/man1/grml-scripts.1.gz /usr/share/man/man1/ip-screen.1.gz diff --git a/net-functions b/net-functions deleted file mode 100644 index a54676a..0000000 --- a/net-functions +++ /dev/null @@ -1,30 +0,0 @@ -# Filename: net-functions -# Purpose: network related functions for use in shellscripts -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -# Latest change: Don Okt 12 09:41:32 CEST 2006 [mika] -################################################################################ - -defaultGWDev() { - ip r s | awk '/^default/ {print $5}' -} - -getLanDevices() { - ignore="vmnet lo sit $(brctl show | awk '{ if(NR >1 ) print $1 }' | xargs)" - filter=$(for mask in $ignore; do echo -n '&& $1 !~ /^'$mask/; done) - awk 'FS=":" {gsub(" ", ""); if(NR>2 '"$filter"' ) print $1 | "sort" } ' /proc/net/dev -} - -getWlanDevices() { - awk 'FS=":" {gsub(" ", ""); if(NR>2 ) print $1 | "sort" } ' /proc/net/wireless -} - -# getLanDriver deviceName -getLanDriver() { - DEVICE="$1" - echo $DEVICE | grep -q ath && DEVICE=$(echo $DEVICE | sed 's/ath/wifi/') - ethtool -i $DEVICE 2>/dev/null | awk '/^driver:/{print $2}' -} - -## END OF FILE ################################################################# diff --git a/routersetup b/routersetup deleted file mode 100644 index 3beee06..0000000 --- a/routersetup +++ /dev/null @@ -1,28 +0,0 @@ -# Filename: /etc/grml/routersetup -# Purpose: configuration file for grml-router, grml-bridge and grml-ap -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -# Latest change: Don Okt 12 10:50:51 CEST 2006 [mika] -################################################################################ - -# configuration for grml-router: -# IPTABLES=/sbin/iptables # the iptables binary -OUTDEV='auto' # outgoing device [auto|default|eth0|...] - -# configuration for grml-bridge: -# BRCTL=/usr/sbin/brctl # the brctl binary -BRIDGE_NAME='br0' # name used for the bridge -BRIDGE_DEVICES='eth0 eth1' # the devices used for bilding the bridge -STP='on' # enable STP (Spanning-Tree Protocol)? on|off -BRIDGE_CONFIG='DHCP' # Use DHCP, Fixed IP or Ipless? DHCP|FIXED|NONE -BRIDGE_IP="192.168.1.1/24" # ip address used for bridge - -# configuration for grml-ap: -# AP_DEVICE='wlan0' # device used as access point -# AP_ESSID='grml-ap' # set essid of accesspoint, by default (if unset) it's grml-ap -# AP_ENC='secretkey' # use encryption? 'off' deactivates encryption - # (default), any other value is used as WEP encr. key -# ATH_MODE=2 # mode for ath device - -## END OF FILE ################################################################# diff --git a/usr_sbin/grml-ap b/usr_sbin/grml-ap deleted file mode 100755 index 4b1b51e..0000000 --- a/usr_sbin/grml-ap +++ /dev/null @@ -1,215 +0,0 @@ -#!/bin/sh -# Filename: grml-ap -# Purpose: set up access point on your box -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -# Latest change: Mit Okt 11 23:00:43 CEST 2006 [moemoe] -################################################################################ - -# exit on any error -set -e - -CONFIG_FILE=/etc/grml/routersetup -. /etc/grml/lsb-functions -. /etc/grml/net-functions -. /etc/grml/script-functions - -check4root - -if ! [ -r "$CONFIG_FILE" ] ; then - eerror "$CONFIG_FILE could not be read." - exit 1 -fi - -. "$CONFIG_FILE" - -[ -n "$AP_ESSID" ] || AP_ESSID=grml-ap -[ -n "$AP_ENC" ] || AP_ENC=off - -info_message() { - DEV="$1" - echo $1 | grep -q wlan && DEV=$(echo $1 | sed 's/wlan/wifi/') - einfo "Finished setting up access point. Make sure your device $DEV is configured:" - einfo "For example put the following into /etc/network/interfaces and run \"ifup $DEV=ap\"" - echo " -iface ap inet static - address 192.168.10.1 - netmask 255.255.255.0 - network 192.168.10.0 - broadcast 192.168.10.255 -" - einfo "On the client side put the following into /etc/network/interfaces and run \"ifup \$DEV=ap\"" - echo " -iface ap inet static - address 192.168.10.2 - netmask 255.255.255.0 - network 192.168.10.0 - broadcast 192.168.10.255 - gateway 192.168.10.1 - wireless_essid $AP_ESSID -" -} - -set_ath_mode() { - eindent - einfo "Setting $1 to mode $2" - iwpriv $1 mode $2 ; eend $? - eoutdent -} - -setupWifiDevice() { - DEV=$1 - einfo "Setting wireless modes on $DEV" - - eindent - einfo "Setting sid to: $AP_ESSID" - iwconfig $DEV essid $AP_ESSID ; eend $? - - [ "$AP_ENC" = off ] && ENC_INFO='off' || ENC_INFO='******' - einfo "Settinc encrypton to: $ENC_INFO " - iwconfig $DEV enc $AP_ENC ; eend $? - - einfo "Setting device up" - ifconfig $DEV up ; eend $? - - eoutdent -} - -setup_atheros() { - einfo "Atheros setup: creating new WLAN AP device" - - # ugly but don't know of another workaround - if iwconfig 2>/dev/null | grep -A1 ath0 | grep -q 'Access Point: Not-Associated' ; then - einfo "Destroying old ath device" - wlanconfig ath0 destroy ; eend $? - fi - - device=$(wlanconfig ath create wlandev $1 wlanmode ap) - eend $? - - setupWifiDevice $device - [ -n "$ATH_MODE" ] && set_ath_mode "$device" "$ATH_MODE" - - info_message $device - exit 0 -} - -setup_hostap() { - einfo "Hostap setup: creating new WLAN AP device" - eindent - - # einfo "Changing mode of $1 to AP" - # ifconfig $1 down ; eend $? - - # dunno if the card is pci or pcmcia, just try to unload and - # load both versions, - [ -n $(lsmod | grep ^orinoco_pci) ] && HAPT="pci" - [ -n $(lsmod | grep ^orinoco_cs) ] && HAPT="cs" - [ -n $(lsmod | grep ^orinoco_plx) ] && HAPT="plx" - - einfo "Unloading old modules" - modprobe -r orinoco orinoco_$HAPT - eend $? - - einfo "Loading new modules" - modprobe hostap_$HAPT - eend $? && setupWifiDevice $1 - - eoutdent - - info_message $1 - exit 0 -} - -setup_iwconfig() { - einfo "Trying to set $1 into mode master" - ifconfig $1 down - iwconfig $1 mode master - eend $? && setupWifiDevice $1 - exit 0 -} - -setup_generic() { - einfo "Generic setup (no hostap / atheros capable device found): creating new WLAN AP device" - echo "TODO! iwconfig $1 mode Ad-Hoc" - exit 0 -} - -detect_wl_cards() { - # If you want to extend this with a specific funtion for a - # special driver, please have a look at /etc/grml/net-functions - for i in $AP_DEVICE $(getWlanDevices) ; do - DRIVER=$(getLanDriver $i) - case $DRIVER in - ath_pci) - echo $i | grep -q ath && i=$(echo $i | sed 's/ath/wifi/') - setup_atheros $i - ;; - orinoco|hostap) - setup_hostap $i - ;; - ipw2100|prism54) - setup_iwconfig $i - ;; - *) - setup_generic $i - ;; - esac - done -} - -stop_devices() { - einfo "Searching for WLAN device with ESSID $AP_ESSID" - DEVICE=$(iwconfig 2>/dev/null| grep "ESSID:\"$AP_ESSID\"" | awk '{print $1}') - eindent - if [ -n "$DEVICE" ] ; then - for i in $DEVICE ; do - einfo "Found device $i" ; eend 0 - done - else - eerror "No device(s) with ESSID $AP_ESSID found" - exit 1 - fi - case $DEVICE in - ath*) - einfo "Shutting down $DEVICE" - ifdown $DEVICE - wlanconfig $DEVICE destroy ; eend $? - exit 0 - ;; - *) - for i in $DEVICE ; do - einfo "Shutting down $i" - ifdown $i ; eend $? - done - exit 0 - ;; - esac - eoutdent -} - -case "$1" in - start) - detect_wl_cards - ;; - stop) - einfo "Trying to stop all present grml-ap setups" - stop_devices - ;; - restart) - $0 stop - sleep 1: - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - -eerror "Your wlan card is not supported at the moment. Sorry" ; eend 1 -exit 1 - -## END OF FILE ################################################################# -# vim: ft=sh expandtab ai diff --git a/usr_sbin/grml-bridge b/usr_sbin/grml-bridge deleted file mode 100755 index 1a4b9c8..0000000 --- a/usr_sbin/grml-bridge +++ /dev/null @@ -1,146 +0,0 @@ -#!/bin/sh -# Filename: grml-bridge -# Purpose: set up your box as bridge -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -# Latest change: Mit Okt 11 23:02:51 CEST 2006 [moemoe] -################################################################################ - -# exit on any error -set -e - -CONFIG_FILE=/etc/grml/routersetup -. /etc/grml/lsb-functions -. /etc/grml/script-functions - -check4root - -if ! [ -r "$CONFIG_FILE" ] ; then - eerror "$CONFIG_FILE could not be read." - exit 1 -fi - -. "$CONFIG_FILE" - -if [ -z "$BRIDGE_DEVICES" ] ; then - eerror "Bridge devices (\$BRIDGE_DEVICES) not set in $CONFIG_FILE" - exit 1 -fi - -[ -n "$BRCTL" ] || BRCTL=brctl -[ -n "$STP" ] || STP=on -[ -n "$BRIDGE_NAME" ] || BRIDGE_NAME=br0 - -check4progs $BRCTL || exit 1 - -case "$1" in - start) - einfo "Starting bridge" - eindent - einfo "Creating bridge device" - brctl addbr "$BRIDGE_NAME" - eend $? - case "$BRIDGE_STP" in - no|false) - ;; - *) - einfo "Setting Spanning-Tree Protocol (STP) to status" - brctl stp "$BRIDGE_NAME" $STP - eend $? - ;; - esac - - einfo "Enabling promiscous mode on: " - eindent - for i in $BRIDGE_DEVICES ; do - einfo "$i" - ip link set "$i" promisc on ; eend $? - done - eoutdent - - einfo "Adding network devices to $BRIDGE_NAME: " - eindent - for i in $BRIDGE_DEVICES ; do - einfo "$i" - brctl addif "$BRIDGE_NAME" $i ; eend $? - done - eoutdent - - einfo "Bringing bridge $BRIDGE_NAME up" - ip link set "$BRIDGE_NAME" up ; eend $? - eindent - case $BRIDGE_CONFIG in - DHCP) - einfo "starting dhclient for $BRIDGE_NAME" - dhclient -e -pf /var/run/dhclient.$BRIDGE_NAME.pid -lf /var/run/dhclient.$BRIDGE_NAME.leases $BRIDGE_NAME - ;; - FIXED) - einfo "Setting IP for $BRIDGE_NAME to $BRIDGE_IP" - ip a a $BRIDGE_IP dev $BRIDGE_NAME - ;; - NONE) - einfo "Leaving $BRIDGE_NAME uconfigured" - ;; - esac - eoutdent - eoutdent - ;; - - stop) - einfo "Stopping bridge" - eindent - if [ $BRIDGE_CONFIG = DHCP ]; then - einfo "Terminating dhclient for $BRIDGE_NAME" - kill $(cat /var/run/dhclient.$BRIDGE_NAME.pid); - fi - einfo "Removing network devices from $BRIDGE_NAME: " - - eindent - for i in $BRIDGE_DEVICES ; do - einfo "$i " - brctl delif "$BRIDGE_NAME" $i ; eend $? - done - eoutdent - - einfo "Disabling promiscous mode on: " - eindent - for i in $BRIDGE_DEVICES ; do - einfo "$i " - ip link set "$i" promisc off ; eend $? - done - eoutdent - - einfo "Bringing bridge: $BRIDGE_NAME down" - ip link set "$BRIDGE_NAME" down; eend $? - - einfo "Removing bridge device" - brctl delbr "$BRIDGE_NAME" - eend $? - eoutdent - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - info) - einfo "$0 - script which turns on basic bridging capabilities" - einfo "Configure via $CONFIG_FILE" ; eend 0 - ;; - - status) - einfo "$0 - status:" - $BRCTL show ; eend $? - ;; - - *) - echo "Usage: $0 {start|stop|restart|status|info}" - exit 1 - ;; -esac - -## END OF FILE ################################################################# -# vim: ft=sh expandtab ai diff --git a/usr_sbin/grml-network b/usr_sbin/grml-network deleted file mode 100755 index 4ba90d9..0000000 --- a/usr_sbin/grml-network +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/bash -# Filename: grml-network -# Purpose: simple frontend to varous connection tools -# Authors: (c) Klaus Knopper Mar 2004, (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -# Latest change: Mit Okt 04 11:52:41 CEST 2006 [mika] -################################################################################ - -PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin" -export PATH - -if [ $UID != 0 ] ; then - echo Error: become root before starting $0 >& 2 - exit 100 -fi - -# XDIALOG_HIGH_DIALOG_COMPAT=1 -# export XDIALOG_HIGH_DIALOG_COMPAT - -CHECK="" -[ "$1" = "check" ] && CHECK="yes" - -TMP=$(mktemp) - -bailout(){ - rm -f "$TMP" - exit $1 -} - -DIALOG="dialog" -# [ -n "$DISPLAY" ] && [ -x /usr/bin/Xdialog ] && DIALOG="Xdialog" - -trap bailout 1 2 3 15 - -# LANGUAGE etc. -[ -r /etc/default/locale ] && . /etc/default/locale - -gauge(){ - rm -f "$TMP.done" - status=0 - while [ ! -e "$TMP.done" ]; do - echo "$status" - status="`expr \( 100 - $status \) / 4 + $status`" - sleep 1 - done | $DIALOG --title "$0" --gauge "$1" 8 75 0 -} - -# Stop status bar -killgauge(){ - touch "$TMP.done" ; wait ; rm -f "$TMP.done" -} - -# Provider specific setup - menu -provider () { - MENUINTERNET=$($DIALOG --stdout --clear --title "$PN" --menu \ - "This script is a submenu of grml-network to set up an internet connection" 14 65 7 \ - "TUG" "Connect via vpnc to TU Graz" \ - "VCGraz" "Connect via pptp to VC-Graz" \ - "Inode" "Connect via pptp to Inode" \ - "Students" "Connect via pptp to Inode-Students" \ - "Exit" "Exit this program") - - retval=$? - case $retval in - (0) - if [ $MENUINTERNET == TUG ] ; then - exec grml-vpnc-tugraz - fi - if [ $MENUINTERNET == VCGraz ] ; then - exec grml-pptp-vcgraz - fi - if [ $MENUINTERNET == Inode ] ; then - exec grml-pptp-inode - fi - if [ $MENUINTERNET == Students ] ; then - exec grml-pptp-xdsl-students - fi ;; - (1) echo "Cancel pressed." ;; - (255) echo "ESC pressed." ;; - esac -} - -main(){ - if [ -z "$NOCHECK" -a -x /usr/bin/nmap ] ; then - gauge "Checking network status..." & - STATUS="" - GW="`echo $(route -n | awk '/^0\.0\.0\.0/{print $2}')`" - GWDEV="`echo $(route -n | awk '/^0\.0\.0\.0/{print $NF}')`" - NMAP="$(nmap -sP --host_timeout 4000 --max_rtt_timeout 4000 $GW 2>/dev/null)" - - if [ "$?" = 0 ]; then - echo "$NMAP" | grep -q "down" >/dev/null 2>&1 || STATUS="online" - fi - - killgauge - - if [ -n "$STATUS" ]; then - [ -n "$CHECK" ] && exit 0 # exit if we are already connected - STATUS="Online ($GWDEV)" - else - STATUS="Offline" - fi - else - STATUS="Unknown" - fi - -# Language-dependent Messages -case "$LANGUAGE" in - de*|at*|ch*) - TITLE1="Netzwerk-Setup" - STATUS="Status: $STATUS" - MESSAGE1="Bitte auswählen:" - MODEMSETUP="/dev/modem-Schnittstelle (neu) konfigurieren" - NETCARD="Netzwerkkarten (LAN/WLAN) Konfiguration" - WIRELESS="Wireless Zugang" - GPRS="Einwahl per Handy/GPRS" - DSL="Einwahl per DSL-Modem" - ISDN="Einwahl per ISDN" - MODEM="Einwahl per Analogmodem" - PROVIDER="Provider spezifische Einstellungen" - EXIT="Beenden" - ;; - *) - TITLE1="Network Setup" - STATUS="Current state: $STATUS" - MESSAGE1="Please select:" - MODEMSETUP="(re)configure /dev/modem device" - NETCARD="Configure network card (LAN/WLAN)" - WIRELESS="Wireless access" - GPRS="Dial via cellphone/GPRS" - DSL="Dial via DSL-adapter" - ISDN="Dial via ISDN" - MODEM="Dial via analog modem" - PROVIDER="Provider specific setup" - EXIT="Quit" - ;; -esac - -# Shortcut description selected -TYPES=(netcardconfig "$NETCARD" \ -provider "$PROVIDER" \ -modemlink "$MODEMSETUP" \ -gprsconnect "$GPRS" \ -pppoeconf "$DSL" \ -isdnconfig "$ISDN" \ -wvdial "$MODEM") - -type wvdial >/dev/null 2>&1 || { unset TYPES[13]; unset TYPES[12]; } -type isdnconfig >/dev/null 2>&1 || { unset TYPES[11]; unset TYPES[10]; } -type pppoeconf >/dev/null 2>&1 || { unset TYPES[9]; unset TYPES[8]; } -type gprsconnect >/dev/null 2>&1 || { unset TYPES[7]; unset TYPES[6]; } -type modemlink >/dev/null 2>&1 || { unset TYPES[5]; unset TYPES[4]; } - -rm -f "$TMP" - -$DIALOG --clear --cancel-label "$EXIT" --title "$TITLE1" --menu "$STATUS - -$MESSAGE1" 18 75 10 "${TYPES[@]}" 2>"$TMP" || bailout 1 - -read TYPE <"$TMP" -TYPE="${TYPE#\"}"; TYPE="${TYPE%\"}" -rm -f "$TMP" - -case "$TYPE" in - wvdial) [ -e /etc/wvdial.conf ] || wvdialconf /etc/wvdial.conf ;; -esac - -eval $TYPE -return "$?" -} - -if [ -z "$NOCHECK" ] ; then - while true; do - main - done -else - main -fi - -## END OF FILE ################################################################# diff --git a/usr_sbin/grml-pptp-inode b/usr_sbin/grml-pptp-inode deleted file mode 100755 index 91c3dcb..0000000 --- a/usr_sbin/grml-pptp-inode +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh -# Filename: grml-pptp-inode -# Purpose: connect via pptp to inode (www.inode.at) -# Authors: grml-team (grml.org), (c) Andreas Gredler -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -# Latest change: Fre Aug 11 11:41:22 CEST 2006 [mika] -################################################################################ - -################################################################################ -# Notes: -# This script is based on 'knoppix-pptp' (version 0.3.1) -# by Wolfgang Scheicher. -################################################################################ - -LANG=C - -if [ "$UID" != 0 ]; then -# sudo $0 -# exit -echo foo -fi - -if [ -z "$FORCE_OLD" ] ; then - dialog --title "Inode XDSL Graz" --msgbox "Please notice that grml-pptp-inode is considered as deprecated. We recommend to use PPPOE for Inode XDSL. - -So please configure your system running pppoeconf - -If you really want to use the old grml-pptp-inode script execute - - FORCE_OLD=1 grml-pptp-inode -" 0 0 -else - -runit(){ -echo "name ${VPNUSERNAME}" > /etc/ppp/peers/inode -cat >> /etc/ppp/peers/inode << "EOF" -remotename XDSL -defaultroute -noipdefault -noauth -noproxyarp -persist -logfile /var/log/pptp.log - -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 - -cat >> /etc/init.d/pptp << "EOF" - -GATEWAY=`ifconfig | awk -v RS="" '/addr:172./{print substr($7,6,11)1}'` -PPTP="/usr/sbin/pptp $VPNSERVER call inode" - -case "$1" in - start) - echo "Starting up XDSL: pptp" - /sbin/route del default &>/dev/null - /sbin/route add -host $VPNSERVER gw $GATEWAY &>/dev/null - start-stop-daemon --start --exec $PPTP - ;; - stop) - echo "Shutting down XDSL: pptp" - killall pppd &>/dev/null - if [ $? == 0 ]; then - /sbin/route del -host $VPNSERVER gw $GATEWAY &>/dev/null - /sbin/route add default gw $GATEWAY &>/dev/null - echo "." - fi - ;; - reconnect) - echo -n "Reconnecting XDSL: pptd" - start-stop-daemon --start --exec $PPTP - echo "." - ;; - *) - echo "Usage: /etc/init.d/pptp {start|stop|reconnect}" - exit 1 - ;; -esac - -exit 0 -EOF - -chmod +x /etc/init.d/pptp -touch /var/log/pptp.log -/etc/init.d/pptp start -dialog --title "PPTP Log" --no-cancel --tailbox /var/log/pptp.log 0 0 -} - -[ -n "${VPNSERVER}" ] || VPNSERVER="10.0.0.138" -[ -n "${VPNUSERNAME}" ] || VPNUSERNAME=$(cat /etc/ppp/pap-secrets | grep XDSL | cut -d " " -f1) -[ -n "${VPNPASSWORD}" ] || VPNPASSWORD=$(cat /etc/ppp/pap-secrets | grep XDSL | cut -d " " -f3) - -if [ -z "$VPNUSERNAME" ] || [ -z "$VPNPASSWORD" ] ; then - COMMAND1=$(dialog --stdout --title "Inode XDSL Graz" --inputbox \ - "Account name(e.g. xdsl.@home):" 0 0) || exit 0 - COMMAND2=$(dialog --stdout --title "Inode XDSL Graz" --passwordbox "Account password (hidden typing)" 0 40) || exit 0 - - VPNUSERNAME=${COMMAND1%/*} - VPNPASSWORD=${COMMAND2#*/} - [ ! -z "$VPNUSERNAME" ] || exit 1 - [ ! -z "$VPNPASSWORD" ] || exit 1 - runit -else - dialog --title "Inode XDSL Graz" --msgbox "Found already configured - account.\nIf the settings are wrong, delete the entries in - /etc/ppp/pap-secrets" 10 45 - runit -fi - -fi # $FORCE_OLD - -## END OF FILE ################################################################# diff --git a/usr_sbin/grml-pptp-vcgraz b/usr_sbin/grml-pptp-vcgraz deleted file mode 100755 index 902a2ab..0000000 --- a/usr_sbin/grml-pptp-vcgraz +++ /dev/null @@ -1,150 +0,0 @@ -#!/bin/zsh -# Filename: grml-pptp-vcgraz -# Purpose: connect via pptp in vc-graz (www.vc-graz.ac.at) -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -# Latest change: Sam Mai 27 15:12:52 CEST 2006 [mika] -################################################################################ - -################################################################################ -# Notes: -# This script is based on 'knoppix-pptp' (versions 0.3.1 and 0.4.0-test2) -# by Wolfgang Scheicher. -################################################################################ - -LANG=C -LC_ALL=C - -if [ "$UID" != 0 ]; then - sudo $0 - exit -fi - -runit(){ -echo "name ${VPNUSERNAME}" > /etc/ppp/peers/vc-graz -cat >> /etc/ppp/peers/vc-graz << "EOF" - -remotename PPTP -ipparam tunl -lock -noauth -nobsdcomp -nodeflate -refuse-pap -refuse-eap -noccp -mtu 1460 -mru 1500 -lcp-echo-failure 10 -lcp-echo-interval 10 -logfile /var/log/pptp.log -persist -maxfail 3 -holdoff 15 -noipdefault -defaultroute -EOF - -# make sure it is not readable by any non-root users: -touch /etc/ppp/chap-secrets -chmod 600 /etc/ppp/chap-secrets -# don't overwrite existing files - so just append: -echo "${VPNUSERNAME} PPTP ${VPNPASSWORD} *" >> /etc/ppp/chap-secrets - -echo -e "#!/bin/sh\nLANG=C\nVPNSERVER=\"${VPNSERVER}\"\nDORMITORY=\"${DORMITORY}\"" > /etc/init.d/pptp-vcgraz -cat >> /etc/init.d/pptp-vcgraz << "EOF" -# connect to vc-graz via pptp -case "$1" in - start) - ifconfig | grep $VPNSERVER > /dev/null && echo "PPTP already started" - ifconfig | grep $VPNSERVER > /dev/null && exit 0 - echo "Starting PPTP Tunnel" - route del default - route add -host $VPNSERVER gw 10.${DORMITORY}.0.1 - route add -net 10.0.0.0 netmask 255.0.0.0 gw 10.${DORMITORY}.0.1 - pppd pty "pptp $VPNSERVER --nolaunchpppd" call vc-graz updetach || exit 1 - ;; - - stop) - ifconfig | grep $VPNSERVER > /dev/null || echo "PPTP already stopped" - ifconfig | grep $VPNSERVER > /dev/null || exit 0 - echo "Stopping PPTP Tunnel" - killall -HUP pppd - killall -HUP pptp - sleep 1 - killall pppd - killall pptp - route del -host $VPNSERVER gw 10.${DORMITORY}.0.1 - route del -net 10.0.0.0 netmask 255.0.0.0 gw 10.${DORMITORY}.0.1 - route add default gateway 10.${DORMITORY}.0.1 - ;; - - restart) - /etc/init.d/pptp-vcgraz stop - sleep 1 - /etc/init.d/pptp-vcgraz start - ;; - - status) - dialog --title "Status of /etc/init.d/pptp-vcgraz - PPTP Log" --no-cancel --tailbox /var/log/pptp.log 0 0 - ;; - - *) - echo 'Usage: /etc/init.d/pptp-vcgraz {start|stop|restart}' >&2 - exit 1 - ;; -esac - -exit 0 -EOF - -chmod +x /etc/init.d/pptp-vcgraz -touch /var/log/pptp.log -/etc/init.d/pptp-vcgraz start -dialog --title "PPTP Log" --no-cancel --tailbox /var/log/pptp.log 0 0 -} - -[ -n "$VPNSERVER" ] || VPNSERVER="10.0.0.3" -[ -n "$DORMITORY" ] || DORMITORY="$(ifconfig | grep "addr:10" | cut -d. -f2)" - -if [ -z "$DORMITORY" ]; then - dialog --stdout --title "VC-Graz" --msgbox "No 10.x.x.x ip address found, sorry. grml-pptp-vcgraz does work only for VC-Graz in 10.x.x.x network. Make sure you requested an ip address via DHCP. Try running pump/dhclient otherwise." 0 0 || \ - echo "No 10.x.x.x ip address found, sorry. grml-pptp-vcgraz does work only for VC-Graz in 10.x.x.x network. Make sure you requested an ip address via DHCP. Try running pump/dhclient otherwise." - exit 1 -fi - -if [ ! -x /usr/sbin/pppd ]; then - dialog --stdout --title "VC-Graz" --msgbox "/usr/sbin/pppd not found. Huh?!" 0 0 || - echo "Error: /usr/sbin/pppd not found. Huh?!" - exit 1 -fi - -if [ ! -x /usr/sbin/pptp ]; then - dialog --stdout --title "VC-Graz" --msgbox "/usr/sbin/pptp not found. Huh?!" 0 0 || - echo "Error: /usr/sbin/pptp not found. Huh?!" - exit 1 -fi - -#[ -n "$VPNUSERNAME" ] || VPNUSERNAME=$(cat /etc/ppp/chap-secrets | grep PPTP | head -1 | cut -d " " -f1) -#[ -n "$VPNPASSWORD" ] || VPNPASSWORD=$(cat /etc/ppp/chap-secrets | grep PPTP | head -1 | cut -d " " -f3) - -if [ -z "$VPNUSERNAME" ] || [ -z "$VPNPASSWORD" ] ; then - COMMAND1=$(dialog --stdout --title "Virtual Campus Graz" --inputbox "Account number:" 0 0) || exit 0 - VPNUSERNAME=${COMMAND1%/*} - if [ -z "$VPNUSERNAME" ] ; then - dialog --stdout --title "Virtual Campus Graz" --msgbox "Sorry, please provide a valid username. Exiting." 0 0 - exit 1 - fi - COMMAND2=$(dialog --stdout --title "Virtual Campus Graz" --passwordbox "Account password (hidden typing)" 0 40) || exit 0 - VPNPASSWORD=${COMMAND2#*/} - if [ -z "$VPNPASSWORD" ] ; then - dialog --stdout --title "Virtual Campus Graz" --msgbox "Sorry, please provide a valid password. Exiting." 0 0 - exit 1 - fi - runit -else - runit -fi - -## END OF FILE ################################################################# diff --git a/usr_sbin/grml-pptp-xdsl-students b/usr_sbin/grml-pptp-xdsl-students deleted file mode 100755 index 5b84bec..0000000 --- a/usr_sbin/grml-pptp-xdsl-students +++ /dev/null @@ -1,172 +0,0 @@ -#!/bin/sh -# Filename: grml-pptp-xdsl-students -# Purpose: connect via pptp to inode ["students-setup"] (www.inode.at) -# Authors: grml-team (grml.org), (c) Martin Hecher -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -# Latest change: Sun Jan 15 16:19:24 CET 2006 [mika] -################################################################################ - -################################################################################ -# Notes: -# This script is based on 'knoppix-pptp' (version 0.3.1) -# by Wolfgang Scheicher -# and based on grml-pptp-inode -# by Andreas 'Jimmy' Gredler -################################################################################ - -LANG=C -DIALOG="dialog" - -if [ "$UID" != 0 ]; then - sudo $0 - exit -fi - -setroute() -{ -set $(grep "option routers" /var/lib/dhcp3/dhclient.leases | tail -1 | cut -f5 -d' ' | tr -d ";") - -ROUTER="$1" -ANT="10.0.0.138" - -if route -n | grep $ANT >>/dev/null - then - /sbin/route del $ANT - fi - -/sbin/route add $ANT gw $ROUTER - -if ifconfig | grep ppp0 >>/dev/null - then - set $(ifconfig ppp0 | grep P-t-P | tr -s [:blank:] | cut -f4 -d' ' | cut -b7-) - GATEWAY="$1" - /sbin/route del default - /sbin/route add default gw $GATEWAY - exit 0 - fi -} - -runit(){ - -/sbin/dhclient ${NET_DEVICE} - -echo "name ${VPNUSERNAME}" > /etc/ppp/peers/inode -cat >> /etc/ppp/peers/inode << "EOF" -remotename XDSL -defaultroute -noipdefault -noauth -persist -logfile /var/log/pptp.log - -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 - -cat >> /etc/init.d/pptp << "EOF" - -PPTP="/usr/sbin/pptp $VPNSERVER call inode" - -case "$1" in - start) - echo "Starting up XDSL: pptp" - start-stop-daemon --start --exec $PPTP - if [ $? == 0 ]; then - echo "." - fi - ;; - stop) - echo "Shutting down XDSL: pptp" - start-stop-daemon --stop --exec $PPTP - if [ $? == 0 ]; then - /sbin/route del -host $VPNSERVER - /sbin/route add default gw $GATEWAY - echo "." - fi - ;; - reconnect) - echo -n "Reconnecting XDSL: pptd" - start-stop-daemon --start --exec $PPTP - echo "." - ;; - *) - echo "Usage: /etc/init.d/pptp {start|stop|reconnect}" - exit 1 - ;; -esac - -exit 0 -EOF - -chmod +x /etc/init.d/pptp -touch /var/log/pptp.log -/etc/init.d/pptp start -$DIALOG --title "Information" --no-cancel --msgbox "Please click OK and wait until remote IP is assigned." 0 0 -$DIALOG --title "PPTP Log" --no-cancel --tailbox /var/log/pptp.log 0 0 -} - -[ -n "$VPNSERVER" ] || VPNSERVER="10.0.0.138" -[ -n "$VPNUSERNAME" ] || VPNUSERNAME="$(cat /etc/ppp/pap-secrets | grep XDSL | cut -d " " -f1)" -[ -n "$VPNPASSWORD" ] || VPNPASSWORD="$(cat /etc/ppp/pap-secrets | grep XDSL | cut -d " " -f3)" - -if [ -z "$VPNUSERNAME" ] || [ -z "$VPNPASSWORD" ] ; then - - COMMAND1=$($DIALOG --stdout --title "Inode XDSL Graz" --inputbox \ - "Account name (e.g. grml@tug):" 0 35) || exit 0 - COMMAND2=$($DIALOG --stdout --title "Inode XDSL Graz" --passwordbox "Account password (hidden typing):" 0 40) || exit 0 - - TMP=$(mktemp) - - bailout(){ - rm -f "$TMP" - exit $1 - } - - NETDEVICES="$(cat /proc/net/dev | awk -F: '/[0-9]:/{print $1}')" - - wireless(){ - case "$(cat /proc/net/wireless 2>/dev/null)" in *$1*) return 0;; esac - # Card exists but is not configured yet - [ -n "$(iwconfig $1 2>/dev/null | head -1)" ] && return 0 - return 1 - } - - if [ -z "$NETDEVICES" ]; then - $DIALOG --msgbox "No network devices found." 15 45 - bailout - fi - - count="$(echo "$NETDEVICES" | wc -w)" - - if [ "$count" -gt 1 ]; then - DEVICELIST="" - for DEVICE in $NETDEVICES; do - wireless "$DEVICE" && DEVICELIST="$DEVICELIST ${DEVICE} Wireless" || DEVICELIST="$DEVICELIST ${DEVICE} LAN" - done - rm -f "$TMP" - $DIALOG --menu "Network device to connect from:" 18 45 12 $DEVICELIST 2>"$TMP" || bailout - read NET_DEVICE <"$TMP" ; rm -f "$TMP" - else - # Remove additional spaces - NET_DEVICE="$(echo $NETDEVICES)" - fi - - VPNUSERNAME=${COMMAND1%/*} - VPNPASSWORD=${COMMAND2#*/} - [ ! -z "$VPNUSERNAME" ] || exit 1 - [ ! -z "$VPNPASSWORD" ] || exit 1 - [ ! -z "$NET_DEVICE" ] || exit 1 - runit - setroute -else - $DIALOG --title "Inode XDSL Graz" --msgbox "Found already configured - account.\nIf the settings are wrong, delete the entries in - /etc/ppp/pap-secrets" 10 45 - runit -fi - -## END OF FILE ################################################################# diff --git a/usr_sbin/grml-router b/usr_sbin/grml-router deleted file mode 100755 index c7c0e16..0000000 --- a/usr_sbin/grml-router +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# Filename: grml-router -# Purpose: set up your box as NAT-router -# Authors: grml-team (grml.org), Ulrich Dangel , Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -# Latest change: Sam Okt 07 23:18:38 CEST 2006 [mika] -################################################################################ - -# exit on any error -set -e - -CONFIG_FILE=/etc/grml/routersetup -. /etc/grml/lsb-functions -. /etc/grml/net-functions -. /etc/grml/script-functions - -if [ $UID != 0 ]; then - eerror "Error: become root before starting $0" - exit 100 -fi - -if ! [ -r $CONFIG_FILE ] ; then - eerror "$CONFIG_FILE could not be read." - exit 1 -fi - -. $CONFIG_FILE - -if [ -z "$OUTDEV" ] ; then - eerror "Outgouing device is not set in $CONFIG_FILE" - exit 1 -fi - -case "$OUTDEV" in - auto|default) - OUTDEV=$(defaultGWDev) - ;; -esac - -[ -n "$IPTABLES" ] || IPTABLES=/sbin/iptables - -check4progs $IPTABLES || exit 1 - -case "$1" in - start) - einfo "Adjusting kernel variables (net.ipv4.*)" - sysctl -w net.ipv4.conf.all.rp_filter=1 1>/dev/null && \ - sysctl -w net.ipv4.conf.all.log_martians=1 1>/dev/null && \ - sysctl -w net.ipv4.ip_forward=1 1>/dev/null - eend $? - einfo "Setting up iptables rule" - eindent - - einfo "Adding masquarade rule" - $IPTABLES -t nat -A POSTROUTING -o $OUTDEV -j MASQUERADE - eend $? - eoutdent - ;; - - stop) - einfo "Resetting kernel variables" - sysctl -w net.ipv4.ip_forward=0 1>/dev/null && \ - sysctl -w net.ipv4.conf.all.log_martians=0 1>/dev/null - eend $? - - einfo "Removing iptables rule" - $IPTABLES -t nat -D POSTROUTING -o $OUTDEV -j MASQUERADE - eend $? - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - info) - einfo "$0 - script which turns on router capabilities (NAT)" - einfo "Configure it via $CONFIG_FILE" ; eend 0 - ;; - - *) - echo "Usage: $0 {start|stop|restart|info}" - exit 1 - ;; -esac - -## END OF FILE ################################################################# -# vim: ft=sh expandtab ai diff --git a/usr_sbin/grml-vpnc-tugraz b/usr_sbin/grml-vpnc-tugraz deleted file mode 100755 index 3e15901..0000000 --- a/usr_sbin/grml-vpnc-tugraz +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh -# Filename: grml-vpnc-tugraz -# Purpose: connect via vpnc in VC-Graz/TU Graz (www.vc-graz.ac.at / www.tugraz.at) -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -# Latest change: Tue Mar 28 10:02:46 CEST 2006 [mika] -################################################################################ - -# Documentation: -# http://www.zid.tugraz.at/ki/netz/extern/vpn/ - -LANG=C -LC_ALL=C - -if [ "$UID" != 0 ]; then - sudo $0 - exit -fi - -function typeofservice() { -NETWORK=$(dialog --stdout --clear --title "foobar" --menu \ -"This script is a submenu of grml-network to set up an internet connection - -Notice if you want to connect to WLAN at TU Graz: -Make sure you have a connection to the access point and an ip-address. -Run 'iwconfig \$DEVICE essid tug ; dhclient \$DEVICE'." 0 0 0 \ -"WLAN" "Connect via WLAN to TU Graz network" \ -"VCGraz" "Connect to VC-Graz (not yet tested - use grml-pptp-vcgraz!)" \ -"External" "External connection (not yet tested!)" \ -"Exit" "Exit this program") - -retval=$? - -case $retval in - 0) - if [ $NETWORK == WLAN ]; then - GATEWAY=129.27.200.1 - # GATEWAY=172.27.12.2 - ACCOUNT='Account information - your TUGOnline username' - fi - - if [ $NETWORK == VCGraz ]; then - GATEWAY=10.0.0.1 - ACCOUNT='Account information - your account number' - fi - - if [ $NETWORK == External ]; then - GATEWAY=129.27.200.1 - ACCOUNT='Account information - account number' - fi - ;; - 1) - echo "Cancel pressed." ; exit - ;; - 255) - echo "ESC pressed." ; exit - ;; -esac -} - -runit(){ -echo "# vpnc at $NETWORK" > /etc/vpnc/vpnctugraz.conf -echo " -Debug 0 -IKE DH Group dh2 -Perfect Forward Secrecy dh2 -IPSec gateway $GATEWAY -IPSec ID default -IPSec secret default -Xauth username $ACCOUNTNAME -Xauth password $PASSWORD - -" >> /etc/vpnc/vpnctugraz.conf - -echo -e "#!/bin/sh\nLANG=C\n" > /etc/init.d/vpnctug -cat >> /etc/init.d/vpnctug << "EOF" -case "$1" in - start) - echo "Starting vpnc" -# route del default -# vpnc /etc/vpnc/vpnctugraz.conf - vpnc-connect /etc/vpnc/vpnctugraz.conf -# route add default dev tun0 - ;; - - stop) - echo "Stopping vpnc" - /usr/sbin/vpnc-disconnect - killall -HUP vpnc - ;; - - *) - echo "Usage: /etc/init.d/vpnctug {start|stop}" >&2 - ;; - -esac - -exit 0 -EOF - -chmod 600 /etc/vpnc/vpnctugraz.conf -chmod +x /etc/init.d/vpnctug -/etc/init.d/vpnctug start -} - -typeofservice -if [ -z "$ACCOUNTNAME" ] || [ -z "$PASSWORD" ] ; then - ACCOUNTNAME=$(dialog --stdout --title "vpnc in $NETWORK" --inputbox "${ACCOUNT}:" 0 0) || exit 0 - PASSWORD=$(dialog --stdout --title "vpnc in $NETWORK" --passwordbox "Account password (hidden typing)" 0 40) || exit 0 - [ -z "$ACCOUNTNAME" ] && exit 1 - [ -z "$PASSWORD" ] && exit 1 - runit -else - runit -fi - -## END OF FILE ################################################################# diff --git a/usr_share/include b/usr_share/include deleted file mode 100644 index 3942848..0000000 --- a/usr_share/include +++ /dev/null @@ -1,14 +0,0 @@ - -Just write the answer next to the ':' in the line. -If you do not know the answer just leave it empty. - -Did the following parts work? - -network (network card): -graphics (framebuffer): -X window (grml-x): - -Did everything work as expected? : -Did you notice any problems? : -Did you miss software? : -Did -- 2.1.4