From 416ab8a37f1b07dc9f6c0fb3ff1a8ff2036510b5 Mon Sep 17 00:00:00 2001 From: Sebastian Schmelzer Date: Thu, 2 Sep 2010 17:50:49 +0200 Subject: change dir structure --- .../plugins/desktop/OpenSLX/Distro/Ubuntu_9_04.pm | 161 --------------------- 1 file changed, 161 deletions(-) delete mode 100644 os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu_9_04.pm (limited to 'os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu_9_04.pm') diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu_9_04.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu_9_04.pm deleted file mode 100644 index 1022d6e8..00000000 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu_9_04.pm +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright (c) 2006..2010 - OpenSLX GmbH -# -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org/ -# ----------------------------------------------------------------------------- -# desktop/OpenSLX/Distro/Ubuntu_9_04.pm -# - provides Ubuntu-specific overrides of the distro API for the desktop -# plugin. -# ----------------------------------------------------------------------------- -package desktop::OpenSLX::Distro::Ubuntu_9_04; - -use strict; -use warnings; - -use base qw(desktop::OpenSLX::Distro::Base); - -use OpenSLX::Basics; -use OpenSLX::Utils; - -################################################################################ -### interface methods -################################################################################ - -sub GDMPathInfo -{ - my $self = shift; - - my $pathInfo = $self->SUPER::GDMPathInfo(); - - # link gdm.conf-custom instead of gdm.conf - $pathInfo->{config} = '/etc/gdm/gdm.conf-custom'; - - return $pathInfo; -} - -sub setupGDMScript -{ - my $self = shift; - my $repoPath = shift; - - my $script = $self->SUPER::setupGDMScript($repoPath); - - my $configFile = $self->GDMPathInfo->{config}; - - $script .= unshiftHereDoc(<<' End-of-Here'); - # cleanup after users Xorg session - sed 's,^#!.*,,' /mnt/etc/gdm/PostSession/Default \ - >/mnt/etc/gdm/PostSession/Default.system - echo -e '#! /bin/sh\n#\n# modified by desktop plugin in Stage3\n#\n - # remove safely any remaining files of the leaving user in /tmp - ( su -c "rm -rf /tmp/*" - echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null ) & - . /etc/gdm/PostSession/Default.system' >/mnt/etc/gdm/PostSession/Default - chmod a+x /mnt/etc/gdm/PostSession/Default* - # gdm should be started after dbus/hal - rllinker gdm 5 10 - echo '/usr/sbin/gdm' >/mnt/etc/X11/default-display-manager - chroot /mnt update-alternatives --set x-window-manager /usr/bin/metacity - chroot /mnt update-alternatives --set x-session-manager \ - /usr/bin/gnome-session - # gdm does not like AUFS/UnionFS on its var directory - rm -rf /mnt/var/lib/gdm - mkdir -m 1770 /mnt/var/lib/gdm - chown root:gdm /mnt/var/lib/gdm - sed '/^\\[daemon\\]/ a\\BaseXsession=/etc/gdm/Xsession' \ - -i /mnt$configFile - End-of-Here - - return $script; -} - -sub KDMPathInfo -{ - my $self = shift; - - my $pathInfo = $self->SUPER::KDMPathInfo(); - my $kdmVer = "4"; - - $pathInfo = { - config => "/etc/kde$kdmVer/kdm/kdmrc", - paths => [ - '/var/lib/kdm', - '/var/run/kdm', - ], - }; - - return $pathInfo; -} - -sub GDMConfigHashForWorkstation -{ - my $self = shift; - - my $configHash = $self->SUPER::GDMConfigHashForWorkstation(); - $configHash->{'daemon'}->{SessionDesktopDir} = - '/etc/X11/session/:/usr/share/xsessions/:/usr/share/gdm/BuiltInSessions/'; - - return $configHash; -} - -sub KDMConfigHashForWorkstation -{ - my $self = shift; - - my $kdmVer = "4"; - my $configHash = $self->SUPER::KDMConfigHashForWorkstation(); - $configHash->{'General'}->{PidFile} = "/var/run/kdm.pid"; - $configHash->{'X-:0-Core'}->{Setup} = "/etc/kde$kdmVer/kdm/Xsetup"; - $configHash->{'X-:0-Core'}->{Startup} = "/etc/kde$kdmVer/kdm/Xstartup"; - $configHash->{'X-:0-Core'}->{Session} = "/etc/kde$kdmVer/kdm/Xsession"; - $configHash->{'X-:0-Core'}->{Reset} = "/etc/kde$kdmVer/kdm/Xreset"; - $configHash->{'X-:0-Core'}->{SessionsDirs} = - '/etc/X11/session,/usr/share/xsessions,/usr/share/apps/kdm/sessions'; - $configHash->{'X-:0-Core'}->{ServerAttempts} = "2"; - - return $configHash; -} - -sub setupKDMScript -{ - my $self = shift; - my $repoPath = shift; - - my $kdmVer = "4"; - my $script = $self->SUPER::setupKDMScript($repoPath); - - # change default theme to openslx-legacy if kdm3 - if ( $kdmVer == "3" ) { - print " * Please change to openslx-legacy theme when using kdm3\n"; - } - - $script .= "kdmver=$kdmVer\n"; - $script .= unshiftHereDoc(<<' End-of-Here'); - - # cleanup after users Xorg session - sed 's,^#!.*,,' /mnt/etc/kde$kdmver/kdm/Xreset \ - >/mnt/etc/kde$kdmver/kdm/Xreset.system - echo -e '#! /bin/sh\n#\n# modified by desktop plugin in Stage3\n#\n - # remove safely any remaining files of the leaving user in /tmp - ( su -c "rm -rf /tmp/*" - $USER - echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null - chmod 0400 /tmp/files.removed ) & - . /etc/kde$kdmver/kdm/Xreset.system' >/mnt/etc/kde$kdmver/kdm/Xreset - chmod a+x /mnt/etc/kde$kdmver/kdm/Xreset* - - rllinker kdm 1 10 - echo '/usr/bin/kdm' > /mnt/etc/X11/default-display-manager - chroot /mnt update-alternatives --set x-window-manager /usr/bin/kwin - chroot /mnt update-alternatives --set x-session-manager \ - /usr/bin/startkde - End-of-Here - - return $script; -} - -1; -- cgit v1.2.3-55-g7522