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

3 files changed, 135 insertions, 262 deletions

diff --git a/initrd/distro-specs/ubuntu/config-default b/initrd/distro-specs/ubuntu/config-default
index 8eee5753..fbf904cf 100644
--- a/initrd/distro-specs/ubuntu/config-default
+++ b/initrd/distro-specs/ubuntu/config-default
@@ -44,7 +44,7 @@ D_DIRINDXS="/var/X11R6/compose-cache \
 D_INITDIR="/init.d"
 D_INITBOOTD="/rcS.d"
 D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
-D_INITDEFAULT="2"
+D_INITDEFAULT="3"
 D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd hwclock.sh sudo dbus"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XFONTPATH="/usr/share/fonts/*"
diff --git a/initrd/distro-specs/ubuntu/functions-6.06 b/initrd/distro-specs/ubuntu/functions-6.06
index 7f8226f3..4a4030ff 100644
--- a/initrd/distro-specs/ubuntu/functions-6.06
+++ b/initrd/distro-specs/ubuntu/functions-6.06
@@ -1,30 +1,21 @@
-# Description:  configuration script for Ubuntu V6.06 Dapper Dake
-#		to configure linux diskless clients (executed within
-#		initial ramdisk after genconfig) 
+# Description:  configuration script for Debian 3.1 to configure
+#		linux diskless clients (executed within initial
+#		ramdisk after genconfig) 
 #
 # Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-05-2006
-#		Nico Dietrich
-#		Felix Endres
+#		Felix Endres, 30-04-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.2.1g
+# Version:      0.2.1d
 
 # distro specific stuff to initialize
 preinit () {
   echo "Creating dhcp user"
-  echo "dhcp:x:101:">>/etc/group
+  echo "dhcp:x:101:" >>/etc/group
   echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd
-
-  testmkd /mnt/etc/rcS.d
-  # load unix module to provide sockets (is compiled into kernel on
-  # the live CDs!?)
-#  modprobe ${MODPRV} unix || error "$df_errumod" nonfatal
-  echo "preinit ende"
 }
-#postinit(){
-#
-#}
+
 # distro specific function called from servconfig script
 config_distro () {
 # add the halt link to the 0 and 6 runlevel directories
@@ -32,30 +23,46 @@ config_distro () {
   ln -sf ../init.d/reboot /mnt/etc/rc6.d/S90reboot
   
   # set default runlevel
-#  sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
-
+  sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
 }
 
 # AUS SuSE-9.3
 # udev/hotplug - auto device discovery service
+# Result: 1 is bad, 0 is good
 udev_hotplug () {
-#  local result=0
-#  [ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal
-#  echo "Enabling hotplug/udev"
-#  udevd -d || result=1
-#  return $result
-:
+  local result=0
+  [ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal
+  echo "Enabling hotplug/udev"
+  #udevstart && result=0
+  #udevtrigger && result=0
+  udevd --daemon || result=1
+  [ ! -e /sbin/udevsend ] && result=1
+  echo "/sbin/udevsend/" > /proc/sys/kernel/hotplug
+  mkdir -p /dev/.udev/db /dev/.udev/queue
+  trigger_device_events
+  return $result
 }
 
+#JD we do not need this function two times ... and definatly wrong the second time
+## distro specific general function called from servconfig script
+#config_distro () {
+## add the halt link to the 0 and 6 runlevel directories
+#  ln -sf ../halt /mnt/etc/rc0.d/S90halt
+#  ln -sf ../reboot /mnt/etc/rc6.d/S90reboot
+#
+#  # set default runlevel
+#  sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
 #}
 
-# linking runlevel 2,3 scripts
+
+# linking runlevel scripts
 rllinker () {
 local script="$1"
 local start="$2"
 local stop="$3"
 # empty runlevel links - decision on running certain services is
 # passed via configuration
+# "stop" seems not to be used in Debian!? - It is. Felix
 for i in rc2.d/K$stop$script rc3.d/K$stop$script \
          rc2.d/S$start$script rc3.d/S$start$script ; do
   if ! [ -f /mnt/etc/init.d/$script ]; then
@@ -69,20 +76,33 @@ done
 }
 
 # group of functions for the normal runlevels - first parameter is start
-# second stop
+# second stop (fixme: is "stop" needed in Debian?? - Yep)
 # function for ntp configuration
-
 config_ntp () {
-:
+if [ -f /mnt/etc/init.d/ntp-server ] ; then
+#JD not needed, as the user is created when installing the ntp-server deb
+#  echo -e "ntp:x:112:112:NTP daemon:/var/lib/ntp:/bin/false" \
+#    >>/mnt/etc/passwd
+#  testmkd /mnt/var/lib/ntp/var/run/ntp &>/dev/null
+  if [ "$start_ntp" == "initial" ] ; then
+    echo -e "# entry added by $0: $date" \
+      >>/mnt/etc/${D_INITDIR}/boot.ld
+    echo "ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \
+      >>/mnt/etc/${D_INITDIR}/boot.ld
+  else
+    rllinker "ntp-server" "20" "02"
+  fi
+fi
 }
 
 # function for atd
 config_atd () {
 if [ "x$start_atd" = "xyes" ]; then
-  # testmkd /mnt/var/spool/atjobs
-  # testmkd /mnt/var/spool/atspool
-  # chown 1:1 /mnt/var/spool/atjobs /mnt/var/spool/atspool
-  rllinker "atd" "14" "04"
+  # fixme!! needed? Fix permissions
+  #testmkd /mnt/var/spool/cron/atjobs
+  #testmkd /mnt/var/spool/cron/atspool
+  #chown /mnt/var/spool/cron/atjobs /mnt/var/spool/cron/atspool
+  rllinker "atd" "89" "01"
 fi
 }
 
@@ -90,9 +110,8 @@ fi
 config_cron () {
 if [ "x$start_cron" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/cron ] ; then
-    rllinker "cron" "18" "02"
-    # fixme! check for proper permissions!
-    testmkd /mnt/var/spool/crontabs
+    rllinker "cron" "89" "01"
+    testmkd /mnt/var/spool/cron/crontabs
     echo -e "# /etc/crontab - file generated by $0:\n\
 #\t$date\nSHELL=/bin/sh\nPATH=/usr/bin:/usr/sbin:/sbin:/bin:/usr/lib/news/bin\
 \nMAILTO=\n-*/15 * * * *\troot\ttest -x /usr/lib/cron/run-crons && \
@@ -106,18 +125,7 @@ fi
 # syslog service
 config_syslog () {
 if [ "x$start_syslog" = "xyes" ] ; then
-  echo -e "# /etc/syslog.conf - file generated by $0" >/mnt/etc/syslogd.conf
-  echo "kern.warn;*.err;authpriv.none\t/dev/tty10\n\
-#kern.warn;*.err;authpriv.none\t|/dev/xconsole\n\
-#*.emerg\n\n*.=warn;*.=err\t\t\t-/var/log/warn\n\
-#*.crit\t\t\t\t/var/log/warn\n*.*;mail.none;news.none\t\t\
-#-/var/log/messages" >> /mnt/etc/syslogd.conf
-#  test -n "$log_servers" && \
-#  for logserver in $log_servers; do
-#       echo -e "*.*;*.*;*.*;*kern.!*\t@$logserver" >>/mnt/etc/syslog.conf
-#  done
-  rllinker "sysklogd" "02" "18"
-  testmkd /mnt/var/log/news
+  :
 fi
 }
 
@@ -125,10 +133,7 @@ fi
 config_sshd () {
 if [ "x$start_sshd" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/ssh ] ; then
-    #testmkd /mnt/var/run/sshd
-    rllinker "ssh" "12" "10"
-  else
-    error "$df_errsshd" nonfatal
+    rllinker "ssh" "20" "02"
   fi
 fi
 }
@@ -137,7 +142,7 @@ fi
 config_snmp () {
 if [ "x$start_snmp" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/snmpd ] ; then
-    rllinker "snmpd" "24" "02"
+    rllinker "snmpd" "30" "03"
     testmkd /mnt/var/lib/net-snmp >/dev/null 2>&1
   fi
     # fixme!!
@@ -145,29 +150,80 @@ if [ "x$start_snmp" = "xyes" ] ; then
   fi
 }
 
-# consolefont
-consolefont () {
-echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
-  >>/mnt/etc/${D_INITDIR}/boot.ld
+# x11 stuff
+descsession () {
+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
+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"
+fi
+# check if /usr/X11R6/bin is writeable, else use /var/X11R6/bin
+if [ -w /mnt/usr/X11R6/bin/WM-Session ] ; then
+  sesspath="/usr/X11R6/bin"
+else
+  sesspath="/var/X11R6/bin"
+  addpath="true"
+fi
+
+# create links to desktop-session chooser
+[ -f /mnt/usr/bin/X11/wmlist ] && wmlist=`cat /mnt/usr/bin/X11/wmlist`
+
+for i in `echo $windowmanagers|sed -e "s/,/ /g"` ; do
+  # beware!! quickhack for VMware sessions
+  strinstr "$i" "$wmlist" || \
+    test -x /mnt/usr/X11R6/bin/$i || \
+    echo -e "[Desktop Entry]\nX-SuSE-translate=true\nEncoding=UTF-8\n\
+Type=XSession\nExec=$i\nTryExec=$sesspath/$i\n\
+Name=$i\n" > /mnt/etc/X11/sessions/$i.desktop
+  # does not work correctly (add /var/X11R6/bin to path!!)
+  test -x /mnt/usr/X11R6/bin/$i || \
+    ln -fs /var/X11R6/bin/desktop-session /mnt/$sesspath/$i
+done
+
+# add special path /var/X11R6/bin to the PATH variable
+# fixme!! add path directly to /etc/profile!?
+#[ "x$addpath" != "x" ] && \
+#  echo -e "# added path component by $0: $date\n\
+#PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/profile
 }
-# acpi and powersave
-config_acpi () {
-  rllinker "acpid" "02" "19"
-  rllinker "acpi-support" "20" "02"
+
+
+# consolefont and language
+consolefont () {
+if [ "$LANG" == "de_DE@euro" ] ; then
+  LANG=de_DE.UTF8
+fi
+sed -e "s,LANGUAGE=.*,LANGUAGE=${LANG}," \
+    -e "s,LANG=.*,LANG=${LANG}," \
+    -i /mnt/etc/environment
+
+rllinker "console-screen.sh" "31" "03"
 }
 
 # 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
+rllinker "gdm" "20" "01"
+#  ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/S13gdm
+#  ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc6.d/K01gdm
   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 "gdm:x:106:113:Gnome Display Manager
 
 echo -e "# /etc/gdm/gdm.conf - file generated by $0\n\
 
@@ -260,11 +316,8 @@ 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 \
@@ -277,14 +330,16 @@ else
 [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
+ :
+}
+
+config_automount () {
+  rllinker "autofs" "19" "19"
 }
 
 # configure hal, dbus, resmgr and services like that
@@ -294,35 +349,12 @@ if [ "x$start_dreshal" = "xyes" ]; then
 fi
 }
 
-# initialize boot.ld - skript to be executed during early system startup
-# (before most of the normal boot init scripts)
-# this script should operate like a normal runlevel script (fixme!!)
-d_mkrlscript () {
-local switch="$1"
-local name="$2"
-local info="$3"
-case "$switch" in
-  init)
-    echo -e "#!/bin/sh\n# skeleton of /etc/${D_INITDIR}/$name written \
-from $0\n# after you applied changes to the creation scripts you have to \
-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
-  ;;
-  close)
-    echo -e "\t;;\n    stop)\n\t;;\nesac\nexit 0" \
-      >>/mnt/etc/${D_INITDIR}/$name
-  ;;
-esac
-}
 
 # fixme!! taken from SuSE10.0 untested here ...
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
-rllinker "vmware-prep" "18" "02"
-rllinker "vmware" "20" "02"
+rllinker "vmware-prep" "22" "02"
+rllinker "vmware" "24" "02"
 # during vmware sessions linux should not handle usb events/devices
 testmkd /mnt/var/X11R6/bin
 echo '#!/bin/sh'>> /mnt/etc/udev/rules.d/01-udev-vm.rules
@@ -338,45 +370,7 @@ echo -e "# special entry to block linux from reacting to usb events during \
 running\n# vmware sessions, generated by $0 during initramfs\n# Dirk von \
 Suchodoletz, <dirk@goe.net>\nSUBSYSTEM==\"usb\", ACTION==\"add\", \
 PROGRAM=\"/var/X11R6/bin/vm-udev\", OPTIONS=\"ignore_device\"\n\
-SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\"" \
-  >> /mnt/etc/udev/rules.d/01-udev-vm.rules
+SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\" \
+  " >> /mnt/etc/udev/rules.d/01-udev-vm.rules
 }
 
-# configure automounter
-config_automount () {
-if [ -f /mnt/etc/init.d/autofs ] ; then
-  testmkd /var/lock/subsys
-  echo -e "# /etc/auto.master - file generated by $0:\n\
-/misc\t/etc/auto.misc" >/mnt/etc/auto.master
-  echo -e "# /etc/auto.misc - file generated by $0:\n" \
-    > /mnt/etc/auto.misc
-  if [ -n "${automnt_src}" ] ; then
-    # local directory and home directory server from machine-setup
-    [ -z "${automnt_dir}" ] && automnt_dir="/home"
-    strinstr "/" "${automnt_dir}" && error "$df_erratpld" nonfatal
-    automnt_dir=${automnt_dir#/}
-    echo -e "/home\t/etc/auto.${automnt_dir}\n" >> /mnt/etc/auto.master
-    echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \
-      > /mnt/etc/auto.${automnt_dir}
-    echo -e "*\t-rsize=32768,wsize=32768,tcp,rw\t${automnt_src}/&" \
-      >> /mnt/etc/auto.${automnt_dir}
-  fi
-  echo -e "# /etc/sysconfig/autofs - file modified by\n#\t$0:\n#" \
-    > /etc/autofs
-  sed -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \
-    /mnt/etc/${D_SYSCONFDIR}/autofs >> /etc/autofs
-  cp /etc/autofs /mnt/etc/${D_SYSCONFDIR}/autofs
-  config_portmap
-  rllinker "autofs" "18" "04"
-fi
-}
-
-# start portmapper (needed at least for nfs and nis services)
-config_portmap () {
-  rllinker "portmap" "02" "20"
-}
-
-# start NIS (fixmee - does the service is really named ypbind??)
-config_nis () {
-  rllinker "ypbind" "06" "16"
-}
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" \