summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2010-08-27 16:18:52 +0200
committerDirk von Suchodoletz2010-08-27 16:18:52 +0200
commit852bfc5e10d94d49fde3eab8ec1cfaac77f9738e (patch)
tree97ccfb009a14f69543d1704d2bd980b79da7c495
parentFix for setting the broadcast properly (in init) ... (diff)
downloadcore-852bfc5e10d94d49fde3eab8ec1cfaac77f9738e.tar.gz
core-852bfc5e10d94d49fde3eab8ec1cfaac77f9738e.tar.xz
core-852bfc5e10d94d49fde3eab8ec1cfaac77f9738e.zip
Fix for the problem reported on the list (sed filter forgotten for the
broadcast variable) ...
-rwxr-xr-xinitramfs/stage3-stuff/init7
1 files changed, 4 insertions, 3 deletions
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index 837d23a5..3f97dba0 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -434,13 +434,14 @@ if [ -n "$ipinfo" ] ; then
serverip=$(getip 2)
gateway=$(getip 3)
subnet_mask=$(getip 4)
- broadcast_address=$(ipcalc -s -b $clientip $subnet_mask)
+ broadcast_address=$(ipcalc -s -b $clientip $subnet_mask|sed s/.*=//)
+ [ -z "$broadcast_address" ] && broadcast_address=255.255.255.255
# we might have an idea of the dns server via preboot
dns_srv=$(getip 5)
[ -n "$dns_srv" ] && echo nameserver $dns_srv >/etc/resolv.conf;
echo -e "# ip configuration written by $0 script:\nclientip=$clientip\n\
-subnet_mask=$subnet_mask\ngateway=$gateway\nserverip=$serverip" \
- >>/etc/initramfs-setup
+subnet_mask=$subnet_mask\ngateway=$gateway\nserverip=$serverip\n\
+broadcast_address=$broadcast_address" >>/etc/initramfs-setup
# set static ip address
ip addr add $clientip/$(ipcalc -s -p $clientip $subnet_mask|sed s/.*=//) \
broadcast $broadcast_address dev $nwif 2>/dev/null