diff options
| author | Dirk von Suchodoletz | 2006-12-22 17:27:36 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-12-22 17:27:36 +0100 |
| commit | 280108a7fadbe4a95e7d7c446240d8e7638d6390 (patch) | |
| tree | a7fdaa354c5c20a11f9dd97f7bdf49a04650f021 /initramfs/distro-specs/ubuntu | |
| parent | Fix for non-busybox watchdog (or should we add (u)sleep to the initramfs (diff) | |
| download | core-280108a7fadbe4a95e7d7c446240d8e7638d6390.tar.gz core-280108a7fadbe4a95e7d7c446240d8e7638d6390.tar.xz core-280108a7fadbe4a95e7d7c446240d8e7638d6390.zip | |
Small cleanups ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@581 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/distro-specs/ubuntu')
| -rw-r--r-- | initramfs/distro-specs/ubuntu/functions-6.06 | 30 | ||||
| -rw-r--r-- | initramfs/distro-specs/ubuntu/functions-default | 9 |
2 files changed, 21 insertions, 18 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 diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index 03652d68..b245f8fb 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -1,13 +1,15 @@ # configuration script for general Ubuntu to configure OpenSLX linux # diskless clients (executed within initial ramdisk after genconfig) # -# Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006 +# this file is distributed under the GPLv2, see ~/openslx/COPYING +# +# Dirk von Suchodoletz <dirk@goe.net>, 22-12-2006 # Nico Dietrich # Felix Endres # mj0, 12-12-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 @@ -23,7 +25,8 @@ preinit () { } -#overwrite settings set by hwautocfg +# overwrite settings set by hwautocfg, pathes will change for newer +# Xorg version 7.X displayvars (){ Files=' \t FontPath\t\t "/usr/share/X11/fonts/misc"\n \t FontPath\t\t "/usr/share/X11/fonts/100dpi/:unscaled"\n |