From dd8f840f0bf3210924ca46655dd0217c83011c8d Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Mon, 2 Jun 2008 12:55:57 +0000
Subject: Removed all kdm/gdm/xdm and most of X configuration. Before altering
 these file this step should be testet, so that painfull merging can be
 avoided. The files in initramfs/distro-specs and initramfs/initrd-stuff
 should be cleaned. Maybe we should drop support for a few older systems and
 refer to an older revision. Dhclinet config should be altered or removed
 since we do not use it anymore. Udhcp should be the default. Example line 267
 in initrd-stuff/etc/functions, begins with: "# create configuration file for
 dhclient."

Removed obsolete theme plugin and the displaymanager themes from the themes dir in the repos. The themes (kdm/gdm) are located in the plugin dir anyway.



git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1831 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/distro-specs/ubuntu/functions-8.04 | 131 ---------------------------
 1 file changed, 131 deletions(-)

(limited to 'initramfs/distro-specs/ubuntu/functions-8.04')

diff --git a/initramfs/distro-specs/ubuntu/functions-8.04 b/initramfs/distro-specs/ubuntu/functions-8.04
index e5b73fd2..479b58a0 100644
--- a/initramfs/distro-specs/ubuntu/functions-8.04
+++ b/initramfs/distro-specs/ubuntu/functions-8.04
@@ -33,134 +33,3 @@ config_distro () {
   sed -i "s/start on runlevel 2/start on stopped rc2/" /mnt/etc/event.d/tty1
 }
 
-# configure gdm as display manager
-config_gdm () {
-ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc2.d/K20gdm
-if [ "x$start_xdmcp" = "xgdm" ]; then 
-  #  configure fallback if no gdm binary present
-  if ! binfinder gdm; then
-    config_kdm
-    # error "" nonfatal
-  else
-    echo $(binfinder gdm) > /mnt/etc/X11/default-display-manager
-  fi
-fi
-ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc2.d/S01gdm
-# append gdm user; check for presence first
-if ! grep "gdm:" /mnt/etc/passwd >/dev/null 2>&1; then
-  echo "gdm:x:113:" >>/mnt/etc/group
-  echo "gdm:x:106:113:Gnome Display Manager:/var/lib/gdm:/bin/false" \
-    >>/mnt/etc/passwd
-fi
-testmkd /mnt/var/lib/gdm/.fontconfig
-echo -e "\tchown gdm:gdm /var/lib/gdm/.fontconfig\n\tchown root:gdm \
-/var/lib/gdm\n" >>/mnt/etc/${D_INITDIR}/boot.slx
-# fixme: check if a gdm.conf was provided via ConfTGZ
-# [ -f /rootfs/etc/gdm/gdm.conf ??? ] || \
-echo -e "# /etc/gdm/gdm.conf - file generated by $0\n\
-
-[daemon]
-AutomaticLoginEnable=false
-AutomaticLogin=
-TimedLoginEnable=false
-TimedLogin=
-TimedLoginDelay=30
-Greeter=/usr/lib/gdm/gdmgreeter
-DefaultPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
-RootPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
-User=gdm
-Group=gdm
-LogDir=/var/log/gdm
-PidFile=/var/run/gdm.pid
-PostLoginScriptDir=/etc/gdm/PostLogin/
-PreSessionScriptDir=/etc/gdm/PreSession/
-PostSessionScriptDir=/etc/gdm/PostSession/
-DisplayInitDir=/etc/gdm/Init
-XKeepsCrashing=/etc/gdm/XKeepsCrashing
-RebootCommand=/sbin/shutdown -r now \"Rebooted from gdm menu.\"
-HaltCommand=/sbin/shutdown -h now \"Halted from gdm menu.\"
-SuspendCommand=/usr/sbin/pmi action sleep
-HibernateCommand=/usr/sbin/pmi action hibernate
-ServAuthDir=/var/lib/gdm
-BaseXsession=/etc/gdm/Xsession
-SessionDesktopDir=/etc/X11/sessions/:/etc/dm/Sessions/:/usr/share/gdm/BuiltInSessions/:/usr/share/xsessions/
-DefaultSession=default.desktop
-UserAuthDir=
-UserAuthFBDir=/tmp
-UserAuthFile=.Xauthority
-StandardXServer=${D_XORGBIN}
-Xnest=/usr/X11R6/bin/Xnest -br -audit 0 -name Xnest
-FirstVT=7
-VTAllocation=true
-SoundProgram=/usr/lib/gdmplay
-[security]
-AllowRoot=false
-AllowRemoteRoot=false
-AllowRemoteAutoLogin=false
-RelaxPermissions=0
-CheckDirOwner=true
-DisallowTCP=true
-[xdmcp]
-Enable=false
-[gui]
-GtkTheme=Human
-AllowGtkThemeChange=true
-GtkThemesToAllow=Human,HighContrast,HighContrastInverse,LowContrast
-[greeter]
-ConfigAvailable=false
-Browser=true
-MinimalUID=1000
-Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
-IncludeAll=true
-LocaleFile=/etc/gdm/locale.conf
-SystemMenu=true
-SecureSystemMenu=false
-DefaultWelcome=true
-DefaultRemoteWelcome=true
-BackgroundColor=#523921
-UseCirclesInEntry=true
-GraphicalTheme=Human
-GraphicalThemeDir=/usr/share/gdm/themes/
-GraphicalThemeRand=false
-SoundOnLogin=true
-SoundOnLoginFile=/usr/share/sounds/question.wav
-[chooser]
-HostImageDir=/usr/share/hosts/
-Hosts=
-Broadcast=true
-Multicast=false
-[debug]
-Enable=false
-[servers]
-0=Standard
-[server-Standard]
-name=Standard server
-command=/usr/X11R6/bin/X -br -audit 0 
-flexible=true
-[server-Terminal]
-name=Terminal server
-command=/usr/X11R6/bin/X -br -audit 0 -terminate
-flexible=false
-handled=false
-[server-Chooser]
-name=Chooser server
-command=/usr/X11R6/bin/X -br -audit 0
-flexible=false
-chooser=true
-
-[debug]
-Enable=$debug" >/mnt/etc/gdm/gdm.conf
-if [ "x$start_x" = "xindirect" ] ; then
-  # when X server consumes to much mem set X -terminate
-  echo -e "\n[servers]\n0=Terminal -audit 0 -indirect \
-$host_name\n\n\
-[server-Terminal]\nname=Terminal server\ncommand=/usr/X11R6/bin/X \
--audit 0\n\
-flexible=true\nhandled=true\nchooser=true" >>/mnt/etc/gdm/gdm.conf
-else
-  echo -e "\n[servers]\n0=Standard\n\n\
-[server-Standard]\nname=Standard server\ncommand=/usr/X11R6/bin/X\n\
-flexible=true\nhandled=true" >>/mnt/etc/gdm/gdm.conf
-fi
-}
-
-- 
cgit v1.2.3-55-g7522