diff options
| -rw-r--r-- | initrd/distro-specs/suse/functions-9.3 | 6 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 34 | ||||
| -rw-r--r-- | initrd/initrd-stuff/etc/vmware-prep | 103 | ||||
| -rwxr-xr-x | vmware/runvmware | 2 |
4 files changed, 88 insertions, 57 deletions
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3 index a0b26fc3..8eb6b424 100644 --- a/initrd/distro-specs/suse/functions-9.3 +++ b/initrd/distro-specs/suse/functions-9.3 @@ -4,11 +4,11 @@ # functions file). This file is the main base for the # following SuSE distributions # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 22-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 31-05-2006 by mj0 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # -# Version: 0.2.2g +# Version: 0.2.2h # distro specific stuff to initialize postinit () { @@ -319,7 +319,7 @@ Session=/etc/X11/xdm/Xsession\nClientLogFile=.xsession-errors-%s\n\ AutoReLogin=false\nAllowRootLogin=true\n\ AllowNullPasswd=true\nAllowShutdown=All\n\ SessionsDirs=/etc/X11/sessions,/usr/share/xsessions,\ -/opt/kde3/share/apps/kdm/sessions\n\ +/opt/kde3/share/apps/kdm/sessions,$vmsessions\n\ AuthNames=XDM-AUTHORIZATION-1,MIT-MAGIC-COOKIE-1\n\n\ [X-*-Greeter]\n\ ShowUsers=Selected\nSelectedUsers=\nUserList=false\n\ diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 630bdefb..33222356 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -5,11 +5,11 @@ # ramdisk) # # Author(s): Dirk von Suchodoletz <dirk@goe.net>, 26-05-2006 -# Michael Janczyk, 24-05-2006 +# Michael Janczyk, 31-05-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # -# Version: 0.1.1d +# Version: 0.1.1e # check for configuration files to source @@ -273,20 +273,48 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then ( nfsmnt ${imgsrv} /mnt/var/lib/vmware || error "$scfg_nfs" nonfatal ) & fi # generate a runlevel script + # + # + # HACK!!! + # + # + # d_mkrlscript init vmware-prep "Starting preparation of vmware environment" sed "s,^#.*,,;/^$/d;s,^,\t," /etc/vmware-prep >> \ /mnt/etc/${D_INITDIR}/vmware-prep d_mkrlscript close vmware-prep "" chmod u+x /mnt/etc/${D_INITDIR}/vmware-prep + cp /mnt/var/lib/vmware/templ/runvmware /mnt/var/X11R6/bin + chmod 755 /mnt/var/X11R6/bin/runvmware >/dev/null 2>&1 + # default kdm session. Xdialog with WM and VMware images + cp /mnt/var/lib/vmware/templ/defaultwm /mnt/var/X11R6/bin + chmod 755 /mnt/var/X11R6/bin/defaultwm >/dev/null 2>&1 + echo -e "#!/bin/sh\n#\n# file generated by ${0} at ${date}\ + \n# set to black background\nxsetroot -solid \"black\"\ + \nstartvm=\$(echo \$0 | sed -e \"s,.*/,,\")\ + \nxterm -bg black -fg white -geometry 100x30+0-0 +sb \ + -e \"/var/X11R6/bin/runvmware -s \${startvm} ${debug}\"\n" \ + > /mnt/var/X11R6/bin/desktop-session + chmod 755 /mnt/var/X11R6/bin/desktop-session + sessions=$(ls /mnt/var/lib/vmware/vmsessions/*.desktop 2>/dev/null) + if [ -n "${sessions}" ]; then + for i in /mnt/var/lib/vmware/vmsessions/*.desktop; do + session_name=$(cat ${i} | grep -iw "exec" \ + | awk -F "=" '{print $2}') + #coppy bacause of initrd + cp /mnt/var/X11R6/bin/desktop-session /mnt/var/X11R6/bin/${session_name} + #ln -s /mnt/var/X11R6/bin/desktop-session /mnt/var/X11R6/bin/${session_name} + done + fi config_vmware chmod 1777 /mnt/var/run/vmware - rm /mnt/etc/vmware/not_configured 2>/dev/null # define a variable where gdm/kdm should look for additional sessions export vmsessions=/var/lib/vmware/vmsessions # create default.desktop for kdm echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Default\n\ Name[de]=Standard\nExec=defaultwm\nTryExec=/var/X11R6/bin/defaultwm\n\ Type=Application" >/mnt/etc/X11/sessions/default.desktop + rm /mnt/etc/vmware/not_configured 2>/dev/null fi ####################################################################### diff --git a/initrd/initrd-stuff/etc/vmware-prep b/initrd/initrd-stuff/etc/vmware-prep index 7c53f366..116c5bc8 100644 --- a/initrd/initrd-stuff/etc/vmware-prep +++ b/initrd/initrd-stuff/etc/vmware-prep @@ -6,10 +6,10 @@ # initial ramdisk # # Author(s): Michael Janczyk <mj0@uni-freiburg.de>, 15-04-2006 -# Dirk von Suchodoletz <dirk@goe.net>, 10-05-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 31-05-2006 # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # -# Version: 0.2d +# Version: 0.2e WILL DISAPPEAR SOON!!! ################################################################################ @@ -29,22 +29,23 @@ ### VARIABLES SECTION ########################################################## # Declaration of default variables vmdir=/var/lib/vmware -path=/var/X11R6/bin -sessions= -session_name= +#path=/var/X11R6/bin +#sessions= +#session_name= ### FUNCTIONS SECTION ########################################################## +# NOT NEEDED NOW # unionfs used? -pathtest () { - if `touch /usr/X11R6/bin/touch >/dev/null 2>&1`; then - path=/usr/X11R6/bin/ - rm ${path}/touch >/dev/null 2>&1 - else - test -d ${path} || mkdir -p ${path} - fi -} +#pathtest () { +# if `touch /usr/X11R6/bin/touch >/dev/null 2>&1`; then +# path=/usr/X11R6/bin/ +# rm ${path}/touch >/dev/null 2>&1 +# else +# test -d ${path} || mkdir -p ${path} +# fi +#} # loop file for exchanging information between linux and vmware @@ -66,42 +67,44 @@ vmnet () { chmod 0700 /dev/vmnet* } - +# MOVED TO INITRD # special start script for vmware with predefined image -copyscript () { - # runvmware - cp ${vmdir}/templ/runvmware ${path} - chmod 755 ${path}/runvmware >/dev/null 2>&1 - - # default kdm session. Xdialog with WM and VMware images - cp ${vmdir}/templ/defaultwm ${path}/defaultwm - chmod 755 ${path}/defaultwm >/dev/null 2>&1 -} - - +#copyscript () { +# # runvmware +# cp ${vmdir}/templ/runvmware ${path} +# chmod 755 ${path}/runvmware >/dev/null 2>&1 +# +# # default kdm session. Xdialog with WM and VMware images +# cp ${vmdir}/templ/defaultwm ${path}/defaultwm +# chmod 755 ${path}/defaultwm >/dev/null 2>&1 +#} + + +# MOVED TO INITRD # blabla sessiondinens -desktop_session () { - echo -e "#!/bin/sh\n#\n# file generated by ${0} at ${date}\ - \n# set to black background\nxsetroot -solid \"black\"\ - \nstartvm=\$(echo \$0 | sed -e \"s,.*/,,\")\ - \nxterm -bg black -fg white -geometry 100x30+0-0 +sb \ - -e \"${path}/runvmware -s \${startvm} ${debug}\"\n" \ - > ${path}/desktop-session - chmod 755 ${path}/desktop-session -} - - +#desktop_session () { +# echo -e "#!/bin/sh\n#\n# file generated by ${0} at ${date}\ +# \n# set to black background\nxsetroot -solid \"black\"\ +# \nstartvm=\$(echo \$0 | sed -e \"s,.*/,,\")\ +# \nxterm -bg black -fg white -geometry 100x30+0-0 +sb \ +# -e \"${path}/runvmware -s \${startvm} ${debug}\"\n" \ +# > ${path}/desktop-session +# chmod 755 ${path}/desktop-session +#} + + +# MOVED TO INITRD # copy nach blabla -vmsession2desktop_session () { - sessions=$(ls ${vmdir}/vmsessions/*.desktop 2>/dev/null) - if [ -n "${sessions}" ]; then - for i in ${vmdir}/vmsessions/*.desktop; do - session_name=$(cat ${i} | grep -iw "exec" \ - | awk -F "=" '{print $2}') - ln -s ${path}/desktop-session ${path}/${session_name} - done - fi -} +#vmsession2desktop_session () { +# sessions=$(ls ${vmdir}/vmsessions/*.desktop 2>/dev/null) +# if [ -n "${sessions}" ]; then +# for i in ${vmdir}/vmsessions/*.desktop; do +# session_name=$(cat ${i} | grep -iw "exec" \ +# | awk -F "=" '{print $2}') +# ln -s ${path}/desktop-session ${path}/${session_name} +# done +# fi +#} ### START SCRIPT ############################################################### @@ -114,20 +117,20 @@ vmsession2desktop_session () { #mount -t nfs -o ro,nolock,intr,nodev,soft,timeo=2,nosuid ${imgsrv} ${vmdir} # check path -pathtest +#pathtest # device creation - the module does not trigger udev properly vmnet # special start script for vmware with predefined image -copyscript +#copyscript # loop file for exchanging information between linux and vmware guest mount_loop # blabla sessiondinens -desktop_session +#desktop_session # copy nach blabla -vmsession2desktop_session +#vmsession2desktop_session diff --git a/vmware/runvmware b/vmware/runvmware index 161a048e..686465f6 100755 --- a/vmware/runvmware +++ b/vmware/runvmware @@ -10,7 +10,7 @@ last_changes=$(head $0 | grep "@" | awk -F ", " '{print $2}' \ | awk -F "-" '{print $3" "$2" "$1}' | sort -bfnr \ | awk '{print $3"-"$2"-"$1}' | grep -m 1 [0-9]) -version=0.14.f +version=0.14.0.242 ################################################################################ |