diff options
Diffstat (limited to 'initramfs/distro-specs/debian/functions-default')
| -rw-r--r-- | initramfs/distro-specs/debian/functions-default | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default index 573950ae..b6d4329a 100644 --- a/initramfs/distro-specs/debian/functions-default +++ b/initramfs/distro-specs/debian/functions-default @@ -1,11 +1,13 @@ # configuration script for general Debian to configure linux diskless clients # (executed within initialramfs after genconfig) # -# Dirk von Suchodoletz <dirk@goe.net>, 31-10-2006 +# this file is distributed under the GPLv2, see ~/openslx/COPYING +# +# Dirk von Suchodoletz <dvs@OpenSLX.com>, 22-12-2006 # Felix Endres, 30-04-2006 # # (c) 2006 - RZ Universitaet Freiburg -# (c) 2006 - OpenSLX.ORG Project +# (c) 2006 - OpenSLX GmbH # empty functions are defined at the beginning of /etc/functions @@ -131,6 +133,7 @@ fi config_syslog () { if [ "x$start_syslog" != "xno" ] ; then : # fixme: Evtl. Verzweigung fuer syslog/-ng Varianten, siehe Ubuntu + # bzw. SuSE fi } @@ -157,23 +160,25 @@ if [ "x$start_snmp" = "xyes" ] ; then # x11 stuff descsession () { +# variable desktop_session is most probably deprecated in near future 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 (see in suse/functions*) +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 |