console_conf startet /etc/init.d/console-screen.sh (korrekte Tastatur einstellungen am Terminal)

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@269 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 3 insertions, 124 deletions

diff --git a/initrd/distro-specs/ubuntu/functions-default b/initrd/distro-specs/ubuntu/functions-default
index bbb87e6e..9b1479d4 100644
--- a/initrd/distro-specs/ubuntu/functions-default
+++ b/initrd/distro-specs/ubuntu/functions-default
@@ -190,133 +190,12 @@ config_acpi () {
 
 # configure gdm as display manager
 config_gdm () {
-  # start the display manager as early as possible, but avoid that is
-  # started twice during bootup - quickhack ...
-  #ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm
-  ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm
-  echo -e "\t/etc/${D_INITDIR}/gdm start >${LOGFILE} 2>&1\n\
-    \t( sleep 120; ln -sf /etc/${D_INITDIR}/gdm /etc/rc3.d/S01gdm \
-    >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
-  # append gdm user
-  echo "gdm:x:113:">>/etc/group
-  echo "gdm:x:106:113:Gnome Display Manager:/var/lib/gdm:/bin/false" >>/etc/passwd
-
-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=/usr/X11R6/bin/X
-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/opt/gnome/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/opt/gnome/gdm/gdm.conf
-fi
+:
 }
 
 # configure kdm as display manager
 config_kdm () {
-  ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
-  echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\
-    \t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \
-    >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+:
 }
 
 # configure hal, dbus, resmgr and services like that
@@ -341,7 +220,7 @@ rerun\n# the mkdxsinitrd script to get them applied" \
       >/mnt/etc/${D_INITDIR}/$name
     echo -e "\n\ncase \"\$1\" in\n    start)\techo -n \"$info\"" \
       >>/mnt/etc/${D_INITDIR}/$name
-    chmod u+x /mnt/etc/${D_INITDIR}/$name
+    chmod +x /mnt/etc/${D_INITDIR}/$name
   ;;
   close)
     echo -e "\t;;\n    stop)\n\t;;\nesac\nexit 0" \