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
7e7bfb0
..
b14a7b6
100755
(executable)
--- a/
grml-terminalserver-config
+++ b/
grml-terminalserver-config
@@
-120,14
+120,8
@@
function actionMkInitrd
echo "Installing initrd $PATH_/minirt26.gz:"
# until we have a stable file location API let's use
# an according heuristic
echo "Installing initrd $PATH_/minirt26.gz:"
# 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 -u "$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_"
}
# }}}
}
# }}}
@@
-173,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_%/*}