Moved stuff from vmware-prep to servconfig for simplifying the VMware

environment setup procedure ... (vmware-prep is deprecated now)


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1033 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 36 insertions, 7 deletions

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 4b9ee775..d6871975 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -313,15 +313,44 @@ config_nscd
 # create needed directories and files
 if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
   for i in /var/X11R6/bin /etc/vmware/vmnet1 /etc/vmware/vmnet8 \
-           /var/run/vmware /etc/X11/sessions/runvmware ; do
+           /var/run/vmware /etc/X11/sessions/runvmware /etc/vmware/loopimg \
+           /etc/vmware/fd-loop; do
     testmkd /mnt/$i
   done
-  # generate a runlevel script
-  d_mkrlscript init vmware-prep "Starting preparation of vmware environment"
-  sed "s,^#.*,,;/^$/d;s,^,        ," /etc/vmware-prep >> \
-    /mnt/etc/${D_INITDIR}/vmware-prep
-  d_mkrlscript close vmware-prep ""
-  chmod u+x /mnt/etc/${D_INITDIR}/vmware-prep
+  # create needed devices (not created automatically via module load)
+  for i in "/dev/vmnet0 c 119 0" "/dev/vmnet1 c 119 1" \
+           "/dev/vmnet8 c 119 8" "/dev/vmmon c 10 165"; do
+    mknod $i
+  done
+  chmod 0700 /dev/vmnet*
+  chmod 1777 /mnt/etc/vmware/fd-loop
+  # loop file for exchanging information between linux and vmware guest
+  if modprobe ${MODPRV} loop; then
+    mdev -s
+  else
+    : #|| error "" nonfatal
+  fi
+  # mount a clean tempfs (bug in UnionFS prevents loopmount to work)
+  strinfile "unionfs" /proc/mounts && \
+    mount -n -o size=1500k -t tmpfs vm-loopimg /mnt/etc/vmware/loopimg
+  dd if=/dev/zero of=/mnt/etc/vmware/loopimg/fd.img \
+    count=2880 bs=512 2>/dev/null
+  chmod 0777 /mnt/etc/vmware/loopimg/fd.img
+  # use dos formatter from rootfs (later stage4)
+  LD_LIBRARY_PATH=/mnt/lib /mnt/sbin/mkfs.msdos \
+    /mnt/etc/vmware/loopimg/fd.img >/dev/null 2>&1 #|| error
+  mount -n -t msdos -o loop,umask=000 /mnt/etc/vmware/loopimg/fd.img \
+    /mnt/etc/vmware/fd-loop
+  echo -e "usbfs\t\t/proc/bus/usb\tusbfs\t\tauto\t\t 0 0" >> /mnt/etc/fstab
+  echo -e "mount -t usbfs usbfs /proc/bus/usb 2>/dev/null" \
+    >> /mnt/etc/${D_INITDIR}/boot.slx
+  # generate a runlevel script (deprecated because stuff could be done in
+  # here ...)
+  #d_mkrlscript init vmware-prep "Starting preparation of vmware environment"
+  #sed "s,^#.*,,;/^$/d;s,^,        ," /etc/vmware-prep >> \
+  #  /mnt/etc/${D_INITDIR}/vmware-prep
+  #d_mkrlscript close vmware-prep ""
+  #chmod u+x /mnt/etc/${D_INITDIR}/vmware-prep
   # check here that mount finished and the important files are available
   if [ "$noimg" = "yes" ] ; then
     error "$scfg_vmdir" nonfatal