X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml-terminalserver-config;h=b14a7b6fb3e71d4c142e7d21b78b1e346c7bf00a;hb=03bd4d097461b19b788b40247ef10885c03be14a;hp=7e7bfb07c570214574b9df0b1f55a4852430d844;hpb=edd63e9b4259f7ae12fb23ee73c5e57e01c99cb1;p=grml-terminalserver.git

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index 7e7bfb0..b14a7b6 100755
--- 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
-  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}'`
+  # 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_%/*}