Adaptions for Ubu 7.04 and Bugfixes for older Versions

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

4 files changed, 137 insertions, 1 deletions

diff --git a/initramfs/distro-specs/ubuntu/config-6.10 b/initramfs/distro-specs/ubuntu/config-6.10
index babbfe07..10759055 100644
--- a/initramfs/distro-specs/ubuntu/config-6.10
+++ b/initramfs/distro-specs/ubuntu/config-6.10
@@ -36,3 +36,7 @@
 
 # mountvirtfs does not exist anymore -> use mountkernfs.sh
 D_INITSCRIPTS="mountkernfs.sh keyboard-setup mountdevsubfs.sh procps.sh bootlogd hwclock.sh sudo console-setup"
+D_ETCEXCL="*.old\n*-\n\
+etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
+pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
+X11/xdm/pixmaps\ndhclient.script"
diff --git a/initramfs/distro-specs/ubuntu/config-7.04 b/initramfs/distro-specs/ubuntu/config-7.04
index f439f345..6aaa7453 100644
--- a/initramfs/distro-specs/ubuntu/config-7.04
+++ b/initramfs/distro-specs/ubuntu/config-7.04
@@ -34,3 +34,10 @@
 # D_BOOTLOCAL - script for user specified stuff which should be started
 # during client bootup, path and file relative to /etc
 
+# Aus 6.10:
+# mountvirtfs does not exist anymore -> use mountkernfs.sh
+D_INITSCRIPTS="mountkernfs.sh keyboard-setup mountdevsubfs.sh procps.sh bootlogd hwclock.sh sudo console-setup"
+D_ETCEXCL="*.old\n*-\n\
+etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
+pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
+X11/xdm/pixmaps\ndhclient.script"
diff --git a/initramfs/distro-specs/ubuntu/config-default b/initramfs/distro-specs/ubuntu/config-default
index 0a7ac7ee..cb1a74bc 100644
--- a/initramfs/distro-specs/ubuntu/config-default
+++ b/initramfs/distro-specs/ubuntu/config-default
@@ -41,7 +41,7 @@ D_ETCEXCL="etc/gconf/*\n*.old\n*-\n\
 etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
 pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
 X11/xdm/pixmaps\ndhclient.script"
-D_BINDMPTS="tmp root home"
+D_BINDMPTS="tmp root home media"
 D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm"
 D_RODIRSINRW="/etc/X11/xkb /var/lib/gconf /var/lib/dpkg /var/lib/aspell /var/lib/pango /var/lib/defoma"
 #D_RWDIRSINRO="/var/lib/gdm"
diff --git a/initramfs/distro-specs/ubuntu/functions-7.04 b/initramfs/distro-specs/ubuntu/functions-7.04
index 1a4678ee..e670278f 100644
--- a/initramfs/distro-specs/ubuntu/functions-7.04
+++ b/initramfs/distro-specs/ubuntu/functions-7.04
@@ -14,3 +14,128 @@
 # initial ramfs - stage3) It may overwrite settings from the default config
 # file (/etc/functions)
 
+
+# configure gdm as display manager
+config_gdm () {
+ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm
+if [ "x$start_xdmcp" = "xgdm" ]; then 
+  echo /usr/sbin/gdm > /mnt/etc/X11/default-display-manager
+fi
+if [ "x$late_dm" = "xyes" ] ; then
+  ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/S01gdm
+else
+  # gdm can not be started before mounting of kernelfs'
+  ln -sf ../${D_INITDIR}/gdm /mnt/etc/rcS.d/S91gdm
+fi
+# append gdm user
+echo "gdm:x:113:">>/etc/group
+echo "gdm:x:106:113:Gnome Display Manager" >> /etc/shadow
+
+# 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
+}