diff options
Diffstat (limited to 'initramfs/distro-specs/ubuntu/functions-6.06')
| -rw-r--r-- | initramfs/distro-specs/ubuntu/functions-6.06 | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-6.06 b/initramfs/distro-specs/ubuntu/functions-6.06 index e439df4f..a2f54be5 100644 --- a/initramfs/distro-specs/ubuntu/functions-6.06 +++ b/initramfs/distro-specs/ubuntu/functions-6.06 @@ -3,12 +3,14 @@ # initial ramfs - stage3) It may overwrite settings from the default config # file (/etc/functions) # -# Dirk von Suchodoletz <dirk@goe.net>, 31-08-2006 +# this file is distributed under the GPLv2, see ~/openslx/COPYING +# +# Dirk von Suchodoletz <dirk@goe.net>, 22-12-2006 # Nico Dietrich # Felix Endres, 29-08-2006 # # (c) 2006 - RZ Universitaet Freiburg -# (c) 2006 - OpenSLX.ORG Project +# (c) 2006 - OpenSLX GmbH # distro specific stuff to initialize preinit () { @@ -41,28 +43,26 @@ udev_hotplug () { } - - - # x11 stuff descsession () { +# variable desktop_session is most probably deprecated 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 +else + windowmanagers="kde,gnome,icewm,failsafe" +fi +# 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" + chmod a+x /mnt/var/X11R6/bin/desktop-session + addpath="true"; fi # check if /usr/X11R6/bin is writeable, else use /var/X11R6/bin if [ -w /mnt/usr/X11R6/bin/WM-Session ] ; then |