projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.99.16.
[grml-terminalserver.git]
/
grml-terminalserver-config
diff --git
a/grml-terminalserver-config
b/grml-terminalserver-config
index
2cfae3f
..
b14a7b6
100755
(executable)
--- a/
grml-terminalserver-config
+++ b/
grml-terminalserver-config
@@
-117,24
+117,11
@@
function actionAutoconf
# INITRD {{{
function actionMkInitrd
{
# INITRD {{{
function actionMkInitrd
{
- echo
echo "Installing initrd $PATH_/minirt26.gz:"
echo "Installing initrd $PATH_/minirt26.gz:"
- if isExistent "$PATH_/minirt26.gz" ; then
- echo
- echo "$PATH_/minirt26.gz exists already, nothing to do"
- return 0
- fi
-
# until we have a stable file location API let's use
# an according heuristic
# until we have a stable file location API let's use
# an according heuristic
- for file in "$(find /live/image/boot -name initrd.gz)"; do
- dir="$(dirname $file)"
- if file "$dir"/linux26 | grep -q "$(uname -r)" ; then
- cp "$dir"/initrd.gz "$PATH_"/minirt26.gz
- echo '... done'
- return 0
- fi
- done
+ initrd_=initrd.img-"$(uname -r)"
+ cp /boot/"$initrd_" "$PATH_"/minirt26.gz || die "Could not copy /boot/$initrd_"
}
# }}}
}
# }}}
@@
-150,7
+137,7
@@
function actionInteractive
local card_title_="Choose network device connected to client network"
local card_message_="Available network devices:"
local iprange_title_="IP Address range for clients"
local card_title_="Choose network device connected to client network"
local card_message_="Available network devices:"
local iprange_title_="IP Address range for clients"
-local iprange_message_="
+
local iprange_message_="
Please enter the desired IP-Range of addresses that should be allocated by clients, separated by a single space.
Example:
Please enter the desired IP-Range of addresses that should be allocated by clients, separated by a single space.
Example:
@@
-162,7
+149,7
@@
for addresses from 192.168.0.101 to (and including) 192.168.0.200.
local runconfig_title_="Networkcard config"
local runconfig_message_="Would you like to configure your interfaces now?"
local runconfig_title_="Networkcard config"
local runconfig_message_="Would you like to configure your interfaces now?"
- # on w
it
ch interfaces should we listen
+ # on w
hi
ch interfaces should we listen
local netdevices_="$(grep -ve 'lo:' -ve 'Inter-|' -ve 'face |bytes' /proc/net/dev | awk -F: '{print $1}')"
local device_list_=""
for INTERFACE_ in $netdevices_; do device_list_="$device_list_ ${INTERFACE_} Networkcard_${INTERFACE_##eth}"; done
local netdevices_="$(grep -ve 'lo:' -ve 'Inter-|' -ve 'face |bytes' /proc/net/dev | awk -F: '{print $1}')"
local device_list_=""
for INTERFACE_ in $netdevices_; do device_list_="$device_list_ ${INTERFACE_} Networkcard_${INTERFACE_##eth}"; done
@@
-180,6
+167,12
@@
for addresses from 192.168.0.101 to (and including) 192.168.0.200.
done
IPRANGE_FROM_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/HostMin/{print $2}'`
done
IPRANGE_FROM_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/HostMin/{print $2}'`
+ # if we have x.x.x.1 as starting range adress provide
+ # x.x.x.10 instead so we avoid possible conflicts with
+ # default gateway
+ if echo $IPFROM | grep -c '\.1$' ; ; then
+ IPFROM="${IPFROM%%\.1}.10"
+ fi
IPRANGE_TO_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/HostMax/{print $2}'`
NETWORK_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/Network:/{print $2}'`
NETWORK_=${NETWORK_%/*}
IPRANGE_TO_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/HostMax/{print $2}'`
NETWORK_=`execute "ipcalc -nb $IP_/$NETMASK_" warn |awk '/Network:/{print $2}'`
NETWORK_=${NETWORK_%/*}