diff options
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 4 | ||||
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 3 | ||||
| -rw-r--r-- | virtualization/templates/runvmware-v2 | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 242e6ad5..2b8ff72c 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -327,8 +327,6 @@ if [ "x$nis_domain" != "x" ] && [ "x$nis_servers" != "x" ] ; then echo $nis_domain >/mnt/etc/defaultdomain echo -e "# /etc/yp.conf - file generated by $0:\n#\t\ $date\n\nypserver "$nis_servers >/mnt/etc/yp.conf - # should be last in passwd file - strinfile "+:::" /mnt/etc/passwd || echo "+::::::" >>/mnt/etc/passwd config_nis fi @@ -485,7 +483,7 @@ if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then # create an empty container file for vmware *.vmem, it does not # like to live on NFS exports if [ "x$vmware" != "x" -a "x$vmware" != "xno" ] ; then - dd if=/dev/zero of=/mnt/tmp/vm-container count=1 seek=204800 + dd if=/dev/zero of=/mnt/tmp/vm-container count=1 seek=2048000 diskfm /mnt/tmp/vm-container /mnt/tmp/vmware chmod a+rwxt /mnt/tmp/vmware fi; } diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index a2781bed..e6c57d82 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -325,7 +325,8 @@ case $dhcp in [ -n $vci ] && vci="-V $vci" testmkd /usr/share/udhcpc ln -s /bin/dhcpmkconfig /usr/share/udhcpc/default.script - udhcpc -b -q $vci -s /usr/share/udhcpc/default.script -i $nwif 2>/dev/null + # -b option is suboptimal here ... + udhcpc -t 8 -q $vci -s /usr/share/udhcpc/default.script -i $nwif 2>/dev/null ;; esac echo "dhcp finished at $(sysup)" >/tmp/dhcp-done diff --git a/virtualization/templates/runvmware-v2 b/virtualization/templates/runvmware-v2 index a39e2cbf..1705318b 100644 --- a/virtualization/templates/runvmware-v2 +++ b/virtualization/templates/runvmware-v2 @@ -74,6 +74,7 @@ vmbuild= vmopt="-X" # temporary disk space for logs, etc... +# use /tmp/vmware/${USER} if /tmp sits on NFS import export tmpdir=/tmp/${USER} # configfile @@ -317,6 +318,7 @@ runvmwareconfheader () mainMem.useNamedFile = \"TRUE\" snapshot.disabled = \"TRUE\" tools.syncTime = \"TRUE\" + # use redoLogDir = \"/dev/shm\" if sitting on NFS import redoLogDir = \"${tmpdir}\" hints.hideAll = \"TRUE\" logging = \"FALSE\" |