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

5 files changed, 105 insertions, 50 deletions

diff --git a/initrd/distro-specs/suse/config-10.1 b/initrd/distro-specs/suse/config-10.1
index e69de29b..712d95f5 100644
--- a/initrd/distro-specs/suse/config-10.1
+++ b/initrd/distro-specs/suse/config-10.1
@@ -0,0 +1,27 @@
+# Description:  distro specific settings for SuSE 10.1. This configuration
+#               is the base for following SuSE versions until the changes
+#               within them require a major change
+#
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-03-2006
+#
+# Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
+
+
+# D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE
+# and RedHat, /etc/default in Debian and Ubuntu
+# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using
+# bind mounts
+# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
+# part of the client filesystem
+# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on
+# TempFS usage
+# D_DIRINDXS - directories in client filesystem which should be present
+# anyhow
+# D_BINDMNT - any code which is specific in bind mount environment
+# D_RCDIRS - runlevel directories relative to /etc
+# D_XF86CONFFILE - name and location of XFree/Xorg config file, e.g.
+# /etc/X11/xorg.conf or /etc/X11/XF86config, ...
+# D_XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
+# D_DEFAULTCOUNTRY - localization (see common functions)
+
+D_INITSCRIPTS="boot.udev boot.proc boot.klog boot.loadmodules boot.clock boot.sysctl boot.ipconfig boot.swap"
diff --git a/initrd/distro-specs/suse/config-9.3 b/initrd/distro-specs/suse/config-9.3
index 7c2b1466..4dc89eb0 100644
--- a/initrd/distro-specs/suse/config-9.3
+++ b/initrd/distro-specs/suse/config-9.3
@@ -2,7 +2,7 @@
 #		is the base for following SuSE versions until the changes
 #		within them require a major change
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 26-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-03-2006
 #
 # Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
 
@@ -43,7 +43,7 @@ D_BINDMNT="# spielspass fuer splash"
 D_INITDIR="/init.d"
 D_INITBOOTD="${D_INITDIR}/boot.d"
 D_RCDIRS="/init.d/rc0.d /init.d/rc1.d /init.d/rc2.d /init.d/rc3.d /init.d/rc4.d /init.d/rc5.d /init.d/rc6.d /init.d/rcS.d"
-D_INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules boot.clock boot.sysctl boot.ipconfig"
+D_INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules boot.clock boot.sysctl boot.ipconfig boot.swap"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
 D_DEFAULTCOUNTRY="de"
diff --git a/initrd/distro-specs/suse/functions-10.1 b/initrd/distro-specs/suse/functions-10.1
index 267b4a53..bfce77ff 100644
--- a/initrd/distro-specs/suse/functions-10.1
+++ b/initrd/distro-specs/suse/functions-10.1
@@ -88,4 +88,3 @@ if [ "x$start_dreshal" = "xyes" ]; then
   fi
 fi
 }
-
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index cd1e527f..ce5af64c 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -145,55 +145,54 @@ if [ "x$start_snmp" = "xyes" ] ; then
   fi
 }
 
-# x11 stuff
-descsession () {
-if [ "x$desktop_session" != "x" ] ; then
-  windowmanagers="$desktop_session"
-  # write script for desktop-session chooser
-  if [ "x$vmware" != "xno" ] ; then
-    debug=""
-    [ ${DEBUGLEVEL} -gt 0 ] && debug="--debug 1"
-    echo -e "#!/bin/sh\n#\n# file generated by\n#\t$0:\n#\t$date\n
-OSTYPE=\`echo \$0 | sed -e \"s,-, ,\" -e \"s,.*/,,\" | awk '{print \$1}'\`
-SPECTYPE=\`echo \$0 | sed -e \"s,-, ,\" -e \"s,.*/,,\" | awk '{print \$2}'\`\n
-OPTS=\"-o \$OSTYPE \${SPECTYPE:+\"-s \$SPECTYPE\"}\"\n
-xterm -bg black -fg white -geometry 170x30+0-0 +sb \
--e \"runvmware \$OPTS $debug\"\n" > /mnt/var/X11R6/bin/desktop-session
-    chmod a+x /mnt/var/X11R6/bin/desktop-session
-    addpath="true";
-  fi
-else
-  windowmanagers="kde,gnome,icewm,failsafe"
-fi
+# x11 stuff --> obsoleted by new vmware integration concept
+#descsession () {
+#if [ "x$desktop_session" != "x" ] ; then
+#  windowmanagers="$desktop_session"
+#  # write script for desktop-session chooser
+#  if [ "x$vmware" != "xno" ] ; then
+#    debug=""
+#    [ ${DEBUGLEVEL} -gt 0 ] && debug="--debug 1"
+#    echo -e "#!/bin/sh\n#\n# file generated by\n#\t$0:\n#\t$date\n
+#OSTYPE=\`echo \$0 | sed -e \"s,-, ,\" -e \"s,.*/,,\" | awk '{print \$1}'\`
+#SPECTYPE=\`echo \$0 | sed -e \"s,-, ,\" -e \"s,.*/,,\" | awk '{print \$2}'\`\n
+#OPTS=\"-o \$OSTYPE \${SPECTYPE:+\"-s \$SPECTYPE\"}\"\n
+#xterm -bg black -fg white -geometry 170x30+0-0 +sb \
+#-e \"runvmware \$OPTS $debug\"\n" > /mnt/var/X11R6/bin/desktop-session
+#    chmod a+x /mnt/var/X11R6/bin/desktop-session
+#    addpath="true";
+#  fi
+#else
+#  windowmanagers="kde,gnome,icewm,failsafe"
+#fi
 # check if /usr/X11R6/bin is writeable, else use /var/X11R6/bin
-if [ -w /mnt/usr/X11R6/bin/WM-Session ] ; then
-  sesspath="/usr/X11R6/bin"
-else
-  sesspath="/var/X11R6/bin"
-  addpath="true"
-fi
+#if [ -w /mnt/usr/X11R6/bin/WM-Session ] ; then
+#  sesspath="/usr/X11R6/bin"
+#else
+#  sesspath="/var/X11R6/bin"
+#  addpath="true"
+#fi
 
 # create links to desktop-session chooser
-[ -f /mnt/usr/bin/X11/wmlist ] && wmlist=`cat /mnt/usr/bin/X11/wmlist`
-testmkd /mnt/etc/X11/sessions
-for i in `echo $windowmanagers|sed -e "s/,/ /g"` ; do
-  # beware!! quickhack for VMware sessions
-  strinstr "$i" "$wmlist" || \
-    test -x /mnt/usr/X11R6/bin/$i || \
-    echo -e "[Desktop Entry]\nX-SuSE-translate=true\nEncoding=UTF-8\n\
-Type=XSession\nExec=$i\nTryExec=$sesspath/$i\n\
-Name=$i\n" > /mnt/etc/X11/sessions/$i.desktop
-  # does not work correctly (add /var/X11R6/bin to path!!)
-  test -x /mnt/usr/X11R6/bin/$i || \
-    ln -fs /var/X11R6/bin/desktop-session /mnt/$sesspath/$i
-done
+#[ -f /mnt/usr/bin/X11/wmlist ] && wmlist=`cat /mnt/usr/bin/X11/wmlist`
+#testmkd /mnt/etc/X11/sessions
+#for i in `echo $windowmanagers|sed -e "s/,/ /g"` ; do
+#  # beware!! quickhack for VMware sessions
+#  strinstr "$i" "$wmlist" || \
+#    test -x /mnt/usr/X11R6/bin/$i || \
+#    echo -e "[Desktop Entry]\nX-SuSE-translate=true\nEncoding=UTF-8\n\
+#Type=XSession\nExec=$i\nTryExec=$sesspath/$i\n\
+#Name=$i\n" > /mnt/etc/X11/sessions/$i.desktop
+#  # does not work correctly (add /var/X11R6/bin to path!!)
+#  test -x /mnt/usr/X11R6/bin/$i || \
+#    ln -fs /var/X11R6/bin/desktop-session /mnt/$sesspath/$i
+#done
 
 # add special path /var/X11R6/bin to the PATH variable
-[ "x$addpath" != "x" ] && \
-  echo -e "# added path component by $0: $date\n\
-PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/SuSEconfig/profile
-
-}
+#[ "x$addpath" != "x" ] && \
+#  echo -e "# added path component by $0: $date\n\
+#PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/SuSEconfig/profile
+#}
 
 # configure X display manager (/etc/sysconfig/displaymanager)
 config_dm_entry () {
@@ -261,7 +260,8 @@ HaltCommand=/sbin/shutdown -h now
 SuspendCommand=/usr/bin/powersave --suspend-to-disk
 BaseXsession=/etc/opt/gnome/gdm/Xsession
 SessionDesktopDir=/usr/share/xsessions/:/etc/X11/sessions/:\
-/etc/opt/gnome/dm/Sessions/:/opt/gnome/share/gdm/BuiltInSessions/
+/etc/opt/gnome/dm/Sessions/:/opt/gnome/share/gdm/BuiltInSessions/:\
+/var/lib/vmware/import/vmsessions
 BaseXsession=/etc/opt/gnome/gdm/Xsession
 SessionDesktopDir=/usr/share/xsessions/:/etc/opt/gnome/dm/Sessions/:\
 /opt/gnome/share/gdm/BuiltInSessions/
@@ -446,6 +446,22 @@ config_portmap () {
 rllinker "portmap" "02" "20"
 }
 
+# start vmware
+config_vmware () {
+echo -e "#! /bin/sh\n# /etc/${D_INITDIR}/vmware-prep\n#\n\
+# file generated by $0 within initial ramdisk\n\
+. /etc/rc.status\n. /etc/sysconfig/logfile\n\
+\ncase \"\$1\" in\n  start)\
+\techo -n \"Starting preparation of vmware environment \"" \
+  >> /mnt/etc/${D_INITDIR}/vmware-prep
+cat /etc/vmware-prep >> /mnt/etc/${D_INITDIR}/vmware-prep
+echo -e "\trc_status -v\n\t;;\nesac\nrc_exit" \
+  >> /mnt/etc/${D_INITDIR}/vmware-prep
+chmod u+x /mnt/etc/${D_INITDIR}/vmware-prep
+rllinker "vmware-prep" "18" "02"
+rllinker "vmware" "20" "02"
+}
+
 # initialize boot.ld - skript to be executed during early system startup
 # (before most of the normal boot init scripts)
 # this script should operate like a normal runlevel script
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 59024122..d26dbea7 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -2,13 +2,13 @@
 #		linux diskless clients (executed within initial
 #		ramdisk after genconfig) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 16-02-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-03-2006
 #		Nico Dietrich
 #		Felix Endres
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.2.1b
+# Version:      0.2.1c
 
 # distro specific stuff to initialize
 preinit () {
@@ -274,6 +274,19 @@ config_nscd () {
 :
 }
 
+# start vmware
+config_vmware () {
+echo -e "#! /bin/sh\n#\n# /etc/${D_INITDIR}/vmware-prep\n\
+# file generated by $0 within initial ramdisk\n\
+# hier fehlt noch der uebliche Ubuntu Startskript header" \
+  >> /mnt/etc/${D_INITDIR}/vmware-prep
+cat /etc/vmware-prep >> /mnt/etc/${D_INITDIR}/vmware-prep
+echo -e "# und der Abschluss" >> /mnt/etc/${D_INITDIR}/vmware-prep
+chmod u+x /mnt/etc/${D_INITDIR}/vmware-prep
+rllinker "vmware-prep" "18" "02"
+rllinker "vmware" "20" "02"
+}
+
 # configure automounter
 config_automount () {
 if [ -f /mnt/etc/init.d/autofs ] ; then