diff options
author | Felix Endres | 2006-08-30 02:35:28 +0200 |
---|---|---|
committer | Felix Endres | 2006-08-30 02:35:28 +0200 |
commit | 8d64f1c8129a5a9a27736a3181d358cf2c7b2a7d (patch) | |
tree | badadbc1560a59ced56ec96599eb585ee9d311db /initrd/distro-specs | |
parent | * changed order of configuration files to be: (diff) | |
download | core-8d64f1c8129a5a9a27736a3181d358cf2c7b2a7d.tar.gz core-8d64f1c8129a5a9a27736a3181d358cf2c7b2a7d.tar.xz core-8d64f1c8129a5a9a27736a3181d358cf2c7b2a7d.zip |
GDM works now for late starting also with bind mounts
Inserted overwrite for default-display-manager setting by machine-setup (or dhcp)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@344 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/distro-specs')
-rw-r--r-- | initrd/distro-specs/ubuntu/config-default | 6 | ||||
-rw-r--r-- | initrd/distro-specs/ubuntu/functions-5.10 | 161 | ||||
-rw-r--r-- | initrd/distro-specs/ubuntu/functions-6.06 | 123 | ||||
-rw-r--r-- | initrd/distro-specs/ubuntu/functions-default | 131 |
4 files changed, 132 insertions, 289 deletions
diff --git a/initrd/distro-specs/ubuntu/config-default b/initrd/distro-specs/ubuntu/config-default index 63b78014..c0ee7c42 100644 --- a/initrd/distro-specs/ubuntu/config-default +++ b/initrd/distro-specs/ubuntu/config-default @@ -35,9 +35,9 @@ pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\ X11/xdm/pixmaps\ndhclient.script\n\ rc2.d/*\nrc5.d/*" D_BINDMPTS="tmp root home" -D_DIRINBINDMNT="/var/run /var/log /var/tmp" -D_RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/" -D_RWDIRSINRO="/var/lib/gdm" +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" D_DIRINDXS="/var/X11R6/compose-cache \ /var/run/sysconfig/tmp /var/adm /var/lib/rpm /var/lib/nobody \ /var/lib/pam_devperm /var/lib/bluetooth \ diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10 index 6a3f3090..f98da405 100644 --- a/initrd/distro-specs/ubuntu/functions-5.10 +++ b/initrd/distro-specs/ubuntu/functions-5.10 @@ -177,138 +177,6 @@ config_acpi () { rllinker "acpi-support" "20" "02" } -# 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/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 -} - -# configure kdm as display manager -config_kdm () { - rllinker "kdm" "25" "01" -# 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 config_dreshal () { if [ "x$start_dreshal" = "xyes" ]; then @@ -364,35 +232,6 @@ 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 () { echo "5.10" diff --git a/initrd/distro-specs/ubuntu/functions-6.06 b/initrd/distro-specs/ubuntu/functions-6.06 index dfe41b49..a2d00ed8 100644 --- a/initrd/distro-specs/ubuntu/functions-6.06 +++ b/initrd/distro-specs/ubuntu/functions-6.06 @@ -159,127 +159,4 @@ sed -e "s,LANGUAGE=.*,LANGUAGE=${LANG}," \ rllinker "console-screen.sh" "31" "03" } -# configure gdm as display manager -config_gdm () { -rllinker "gdm" "13" "01" -ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm -# 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" >> /etc/shadow -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/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 - -} - -config_automount () { - rllinker "autofs" "19" "19" -} diff --git a/initrd/distro-specs/ubuntu/functions-default b/initrd/distro-specs/ubuntu/functions-default index e24c802c..f1a533bf 100644 --- a/initrd/distro-specs/ubuntu/functions-default +++ b/initrd/distro-specs/ubuntu/functions-default @@ -53,6 +53,7 @@ config_distro () { # set default runlevel sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab + } # AUS SuSE-9.3 @@ -199,12 +200,135 @@ config_acpi () { # 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 + echo -e "\t/etc/${D_INITDIR}/gdm start >${LOGFILE} 2>&1\n\ + \t( sleep 60; ln -sf /etc/${D_INITDIR}/gdm /etc/rc3.d/S01gdm \ + >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld +fi +# append gdm user +echo "gdm:x:113:">>/etc/group +echo "gdm:x:106:113:Gnome Display Manager" >> /etc/shadow + +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/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 } # configure kdm as display manager config_kdm () { -: + rllinker "kdm" "25" "01" +# 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 @@ -212,6 +336,9 @@ config_dreshal () { if [ "x$start_dreshal" = "xyes" ]; then rllinker "dbus" "17" "20" fi +if [ "x$start_xdmcp" = "xkdm" ]; then + echo /usr/bin/kdm > /mnt/etc/X11/default-display-manager +fi } # initialize boot.ld - skript to be executed during early system startup |