added hard disk detection, swap and special partition "44", started with

new vmware environment integration ...



git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@96 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 9 insertions, 16 deletions

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index ce1543ba..a6ce3793 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -194,7 +194,7 @@ if [ "x$start_x" != "xno" ] ; then
   chmod a+rwxt /mnt/tmp/.X11-unix
   echo "" > /mnt/etc/X11/xdm/Xservers
   # define additional sessions offered to the user (via dhcp/ldap config)
-  descsession
+  # descsession -> deprecated by new vmware integration concept
   # write available X display manager to /etc/X11/xdm/Xaccess
   [ -n "$x_display_manager" ] && \
   echo -e "# /etc/X11/xdm/Xaccess - file generated by $0: \
@@ -307,7 +307,7 @@ if [ "x$nis_domain" != "x" ] && [ "x$nis_servers" != "x" ] ; then
   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
+  strinfile "+::::::" /mnt/etc/passwd||echo "+::::::" >>/mnt/etc/passwd
 fi
 
 #######################################################################
@@ -321,20 +321,13 @@ config_nscd
 
 # create needed directories and files
 if [ "x$vmware" != "x" ] || [ "x$vmware" != "xno" ] ; then
-for i in /var/lib/vmware /etc/vmware/vmnet1 /etc/vmware/vmnet8 \
-         /var/run/vmware ; do
-  testmkd /mnt/$i
-done
-chmod 1777 /mnt/var/run/vmware
-rm /mnt/etc/vmware/not_configured
-# device creation might not be needed any longer!?
-for i in 0 1 2 3 4 5 6 7 8 9; do
-  [ -c /mnt/dev/vmnet$i ] || mknod /dev/vmnet$i c 119 $i
-done
-chmod 0700 /mnt/dev/vmnet*
-# check for the place of VM images
-
-
+  config_vmware
+  for i in /var/lib/vmware /etc/vmware/vmnet1 /etc/vmware/vmnet8 \
+           /var/run/vmware ; do
+    testmkd /mnt/$i
+  done
+  chmod 1777 /mnt/var/run/vmware
+  rm /mnt/etc/vmware/not_configured 2>/dev/null
 fi
 
 # servconfig finished successfully