From 6f58dd2349d836360595937d37e406f88dbe5bd4 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 26 Aug 2010 18:29:28 +0200
Subject: Fix for setting the broadcast properly (in init) ...

---
 initramfs/stage3-stuff/init                                  |  3 ++-
 installer/OpenSLX/OSSetup/Distro/Base.pm                     | 12 ------------
 .../vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh        |  4 ++--
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index 0d7fd837..837d23a5 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -434,6 +434,7 @@ if [ -n "$ipinfo" ] ; then
   serverip=$(getip 2)
   gateway=$(getip 3)
   subnet_mask=$(getip 4)
+  broadcast_address=$(ipcalc -s -b $clientip $subnet_mask)
   # 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;
@@ -442,7 +443,7 @@ subnet_mask=$subnet_mask\ngateway=$gateway\nserverip=$serverip" \
     >>/etc/initramfs-setup
   # set static ip address
   ip addr add $clientip/$(ipcalc -s -p $clientip $subnet_mask|sed s/.*=//) \
-    dev $nwif 2>/dev/null
+    broadcast $broadcast_address dev $nwif 2>/dev/null
   ip route add default via $gateway 2>/dev/null
 else
   noipyet="yes"
diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index f23bba0c..c356e6d9 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -233,18 +233,6 @@ sub getDefaultPathList
     ) ];
 }
 
-#sub addUclibLdconfig
-#{
-#    my $self       = shift;
-#    #my $ldpath     = shift;
-#
-#    open(OUTFILE, ">", "/etc/ld.so.conf.d/uclib.conf") 
-#      or die ("unable to create the uclib.conf within ld.so.conf.d");
-#    print OUTFILE "/opt/openslx/uclib-rootfs/lib\n";
-#    print OUTFILE "/opt/openslx/uclib-rootfs/usr/lib\n";
-#    close(OUTFILE);
-#}
-
 sub updateDistroConfig
 {
     if (slxsystem("ldconfig")) {
diff --git a/os-plugins/plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh b/os-plugins/plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh
index 5a0ac320..a28a8c6f 100644
--- a/os-plugins/plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh
+++ b/os-plugins/plugins/vmware/init-hooks/80-after-plugins/adapt-tmpfs.sh
@@ -16,9 +16,9 @@
 # adapt tmpfs size (overbook)
 case $(grep tmpfs /proc/mounts) in
   */tmp*)
-    mount -o remount,size=150% /mnt/tmp
+    mount -o remount,size=160% /mnt/tmp
     ;;
   */uniontmp*)
-    mount -o remount,size=150% /mnt/uniontmp
+    mount -o remount,size=160% /mnt/uniontmp
     ;;
 esac
-- 
cgit v1.2.3-55-g7522