diff options
59 files changed, 0 insertions, 1895 deletions
diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default index 8e3f5cd5..0eb8d668 100644 --- a/initramfs/distro-specs/debian/config-default +++ b/initramfs/distro-specs/debian/config-default @@ -55,7 +55,3 @@ D_XF86CONFFILE="/etc/X11/xorg.conf" D_XORGBIN=/usr/X11R6/bin/X D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*" D_DEFAULTCOUNTRY="de" -# deprecated, moved to "desktop" plugin! Some of the preparations should -# be moved to the debian "desktop.sh" script to be defined in debian.pm -D_KDMRCPATH=/etc/kde3/kdm -D_XDMPATH=/etc/kde3/kdm diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default index 67e613c2..52d4fea9 100644 --- a/initramfs/distro-specs/debian/functions-default +++ b/initramfs/distro-specs/debian/functions-default @@ -143,15 +143,6 @@ if [ "x$start_snmp" = "xyes" ] ; then fi } -# x11 stuff -descsession () { -# variable desktop_session is most probably deprecated in near future -if [ "x$desktop_session" != "x" ] ; then - windowmanagers="$desktop_session" -else - windowmanagers="kde,gnome,icewm,failsafe" -fi - # add special path /var/X11R6/bin to the PATH variable # fixme!! add path directly to /etc/profile!? #[ "x$addpath" != "x" ] && \ @@ -173,36 +164,6 @@ sed -e "s,LANG=.*,LANG=\"${LANG}\" # set within initramfs," \ -i /mnt/etc/default/locale } -# deprecated, moved to "desktop" plugin! Some of the preparations should -# be moved to the ubuntu "desktop.sh" script to be defined in debian.pm -# configure gdm as display manager -config_gdm () { -ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm -ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/S01gdm -# check for gdm user in passwd file and add it if not present -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 -# fixme: any directory with certain permissions needed? -# testmkd /mnt/var/lib/gdm/.fontconfig -# echo -e "\tchown gdm:gdm /var/lib/gdm/.fontconfig\n\t\chown root:gdm \ -#/var/lib/gdm" >> /mnt/etc/${D_INITDIR}/boot.slx -} - -# same as for gdm ... -# configure kdm as display manager -config_kdm () { -# first define directories for kdm -ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm -ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/S20kdm - -# write configuration file -# use general config in /etc/functions -config_kdm_template -} - # configure hal, dbus, resmgr and services like that config_dreshal () { if [ "x$start_dreshal" = "xyes" ]; then diff --git a/initramfs/distro-specs/gentoo/config-default b/initramfs/distro-specs/gentoo/config-default index 13927a6f..38928300 100644 --- a/initramfs/distro-specs/gentoo/config-default +++ b/initramfs/distro-specs/gentoo/config-default @@ -49,8 +49,3 @@ D_XFONTPATH="/usr/share/fonts/*" D_DEFAULTCOUNTRY="de" D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng" D_BOOTLOCAL="conf.d/local.start" - -# deprecated, moved to "desktop" plugin! Some of the preparations should -# be moved to the gentoo "desktop.sh" script to be defined in gentoo.pm -D_KDMRCPATH=/var/lib/openslx/themes/displaymanager -D_XDMPATH=/etc/X11/kdm diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default index a9da16fe..988e7412 100644 --- a/initramfs/distro-specs/gentoo/functions-default +++ b/initramfs/distro-specs/gentoo/functions-default @@ -236,145 +236,6 @@ local file=$3 sed -e "s,$var=.*,$var=\"$value\"," -i /mnt/etc/${file} } -# general display manager stuff like runlevel link and config file entry -config_dm_entry () { -local displmng=$1 -if [ -f /mnt/etc/${D_INITDIR}/xdm ] ; then - config_rc_entry "DISPLAYMANAGER" "${displmng}" - rllinker xdm -else - error "" nonfatal -fi -} - - -# configure X display manager (runlevel links and kind of manager) -config_xdm () { -# runlevel and config stuff -config_dm_entry xdm -} - -# configure gdm -config_gdm () { -# runlevel stuff -config_dm_entry gdm -# fixme!! check for needed directories and permissions -#testmkd /mnt/var/lib/gdm -#testmkd /mnt/var/log/gdm -#strinfile "gdm:" /mnt/etc/passwd || echo "gdm:x:50:15:Gnome Display Manager \ -#Daemon:/var/lib/gdm:/bin/false" >>/mnt/etc/passwd -# hack - gdm should be user 50 and shadow group 15 -#chown 50:15 /mnt/var/lib/gdm /mnt/var/log/gdm -#chmod 0750 /mnt/var/lib/gdm /mnt/var/log/gdm -} - -# configure kdm as display manager -config_kdm () { -config_dm_entry kdm - -# setting the path for kdmrc-file -# FIXME: hack - there is no other way in gentoo?!? Why the hell in "themes" -# directory?? -sed -e 's,\(PIDFILE:.*\)|| \\$,\1 -- -config \${D_KDMRCPATH}/kdmrc || \\,g'\ - -i /mnt/etc/X11/startDM.sh - -# write configuration file - NOT using general config in /etc/functions -##config_kdm_template - -usetheme=false -themeconf=$(ls /mnt/${D_KDMRCPATH}/*.xml 2>/dev/null) -[ -r "${themeconf}" ] && usetheme=true -# check if a kdmrc was provided via ConfTGZ -[ -f /rootfs/${D_KDMRCPATH}/kdmrc ] || \ - echo -e "# ${D_KDMRCPATH}/kdmrc - \ -file generated by -#\t$0: $date\n\ -[General] -ConfigVersion=2.3 -StaticServers=:0 -ReserveServers=:1,:2,:3 -ServerVTs=-7 -ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6 -PidFile=/var/run/kdm.pid -[Xdmcp] -Enable=false -Willing=/usr/kde/3.5/share/config/kdm/Xwilling -[Shutdown] -[X-*-Core] -ServerCmd=${D_XORGBIN} -br -Setup=/usr/kde/3.5/share/config/kdm/Xsetup -Startup=/usr/kde/3.5/share/config/kdm/Xstartup -Reset=/usr/kde/3.5/share/config/kdm/Xreset -Session=/usr/kde/3.5/share/config/kdm/Xsession -AllowRootLogin=true -AllowNullPasswd=false -AllowShutdown=Root -SessionsDirs=/etc/X11/Sessions,/usr/share/xsessions -ClientLogFile=.xsession-errors-%s -[X-*-Greeter] -LogoArea=Logo -LogoPixmap=/usr/kde/3.5/share/apps/kdm/pics/kdelogo.png -MinShowUID=1000 -MaxShowUID=65000 -ForgingSeed=1165509407 -Preloader=/usr/kde/3.5/bin/preloadkde -Theme=/var/lib/openslx/themes/displaymanager -UseBackground=true -BackgroundCfg=/var/lib/openslx/themes/displaymanager/backgroundrc -[X-:*-Core] -ServerCmd=/usr/bin/X -br -ServerArgsLocal=-nolisten tcp -AllowNullPasswd=true -AllowShutdown=All -[X-:*-Greeter] -PreselectUser=Previous -FocusPasswd=true -LoginMode=DefaultLocal -AllowClose=false -[X-:0-Core] -ClientLogFile=.xsession-errors -[X-:0-Greeter] -ShowUsers=Selected -SelectedUsers= -UserList=false -GUIStyle=default -LogoArea=Clock -GreetString=Diskless Linux (%h) -GreetFont=Nimbus Sans l,20,-1,5,48,0,0,0,0,0" >/mnt/${D_KDMRCPATH}/kdmrc -echo -e "[Desktop0] -BackgroundMode=Flat -BlendBalance=100 -BlendMode=NoBlending -ChangeInterval=60 -Color1=0,51,102 -Color2=255,255,255 -CurrentWallpaper=0 -LastChange=0 -MinOptimizationDepth=1 -MultiWallpaperMode=NoMulti -Pattern=triangles -Program= -ReverseBlending=false -UseSHM=false -Wallpaper= -WallpaperList= -WallpaperMode=NoWallpaper" \ - >/mnt/var/lib/openslx/themes/displaymanager/backgroundrc - - - -#Gentoo specifics?? -#sed -e 's,\(save_options .*\)"$,\1 -- -config ${D_KDMRCPATH}/kdmrc",g'\ -# -i /mnt/etc/init.d/xdm -#sed -e "s,\(ServerCmd=\).*,\1${D_XORGBIN} -br,g"\ -# -e "s,ShowLog=false,,g"\ -# -e "s,LogSource=false,,g"\ -# -e "s,UseAdminSession=.*,,g"\ -# -e "s,\(Startup=\).*$,\1/etc/X11/Sessions/Xsession,g"\ -# -i /mnt/${D_KDMRCPATH}/kdmrc - -} - # configure bluetooth services config_bt () { if [ -f /mnt/etc/init.d/bluetooth ] ; then diff --git a/initramfs/distro-specs/suse/config-default b/initramfs/distro-specs/suse/config-default index 9187df65..ccd45ac6 100644 --- a/initramfs/distro-specs/suse/config-default +++ b/initramfs/distro-specs/suse/config-default @@ -61,7 +61,3 @@ D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*" D_DEFAULTCOUNTRY="de" D_HWMODTOIGNORE="i8xx-tco ichxrom snd-atiixp-modem intel-rng" D_BOOTLOCAL="init.d/boot.local" -# deprecated, moved to "desktop" plugin! Some of the preparations should -# be moved to the suse "desktop.sh" script to be defined in suse.pm -D_KDMRCPATH=/etc/opt/kde3/share/config/kdm -D_XDMPATH=/etc/X11/xdm diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2 index e9e7258f..983e7ad8 100644 --- a/initramfs/distro-specs/suse/functions-10.2 +++ b/initramfs/distro-specs/suse/functions-10.2 @@ -13,15 +13,6 @@ # in general SuSE base definitions ... General changes should be done there, # version specific changes for the 10.2 go here. -# display manager configuration -config_kdm () { -# use different kdmrc than default, since 10.2 in /opt/kde/... -echo "XDMOPTIONS=\"-config ${D_KDMRCPATH}/kdmrc\"" \ - >> /mnt/etc/sysconfig/displaymanager -config_dm_entry yes -# write configuration file with general config from /etc/functions -config_kdm_template -} # configure dbus (inter application communication for kde and gnome), hal # (hardware abstraction layer - used e.g. by powersaved), resmgr and # policykitd (resource manager/policykitd - the user gets permissions to diff --git a/initramfs/distro-specs/suse/functions-10.3 b/initramfs/distro-specs/suse/functions-10.3 index 68373262..f18f7845 100644 --- a/initramfs/distro-specs/suse/functions-10.3 +++ b/initramfs/distro-specs/suse/functions-10.3 @@ -13,15 +13,6 @@ # defined in general SuSE base definitions ... General changes should be done # there, version specific changes for the 10.3 go here. -# display manager configuration -config_kdm () { -# use different kdmrc than default, since 10.2 in /opt/kde/... -echo "XDMOPTIONS=\"-config ${D_KDMRCPATH}/kdmrc\"" \ - >> /mnt/etc/sysconfig/displaymanager -config_dm_entry yes -# write configuration file with general config from /etc/functions -config_kdm_template -} # config nfsv4 config_nfsv4 () { if [ "x$start_nfsv4" = "xyes" ]; then diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index 269465b5..c34c4003 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -233,157 +233,6 @@ if [ "$start_samba" != "no" ]; then -i /mnt/etc/lisarc fi } -# configure X display manager (/etc/${D_SYSCONFDIR}/displaymanager) -config_dm_entry () { -local dm="$1" -# should be stated that entries were made (fixmee how??) -# autologin is defined some other way ... -# -e "s,.*_AUTOLOGIN.*,DISPLAYMANAGER_AUTOLOGIN=\"\"," \ -sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"$start_xdmcp\"," \ - -e "s,.*_XSERVER.*,DISPLAYMANAGER_STARTS_XSERVER=\"$dm\"," \ - -i /mnt/etc/${D_SYSCONFDIR}/displaymanager -# start the display manager as early as possible in runlevel 5 -ln -sf ../xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm -ln -sf ../xdm /mnt/etc/${D_INITDIR}/rc5.d/K18xdm -sed -e "s,xdm: .*,xdm:," -i /mnt/etc/${D_INITDIR}/.depend.start -} -# configure X display manager (runlevel links and kind of manager) -config_xdm () { -config_dm_entry yes -} -# configure gdm as display manager -config_gdm () { -config_dm_entry yes -testmkd /mnt/var/lib/gdm -testmkd /mnt/var/log/gdm -strinfile "gdm:" /mnt/etc/passwd || echo "gdm:x:50:15:Gnome Display Manager \ -Daemon:/var/lib/gdm:/bin/false" >>/mnt/etc/passwd -# hack - gdm should be user 50 and shadow group 15 -chown 50:15 /mnt/var/lib/gdm /mnt/var/log/gdm -chmod 0750 /mnt/var/lib/gdm /mnt/var/log/gdm -xdmcp_hosts=`echo $x_display_manager|sed -e "s; ;,;"` -if [ "${DEBUGLEVEL}" -gt 0 ] ; then - local debug="true" -else - local debug="false" -fi -# check if a gdm.conf was provided via ConfTGZ -if [ ! -f /etc/opt/gnome/gdm/gdm.conf ] ; then - echo -e "# /etc/opt/gnome/gdm/gdm.conf - file generated by $0\n\ -[daemon] -AutomaticLoginEnable=false -TimedLoginEnable=false -#AlwaysRestartServer=false -Chooser=/opt/gnome/lib/gdm/gdmchooser -Greeter=/opt/gnome/lib/gdm/gdmgreeter -RemoteGreeter=/opt/gnome/lib/gdm/gdmgreeter -DefaultPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/bin:\ -/opt/gnome/bin:/opt/kde3/bin:/opt/kde/bin:/usr/openwin/bin -RootPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/local/bin:/usr/bin:\ -/usr/X11R6/bin:/bin:/usr/games:/opt/bin:/opt/gnome/bin:/opt/kde3/bin:\ -/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin -User=gdm -Group=shadow -#KillInitClients=true -LogDir=/var/lib/gdm -ServAuthDir=/var/lib/gdm -PostLoginScriptDir=/etc/opt/gnome/gdm/PostLogin/ -PreSessionScriptDir=/etc/opt/gnome/gdm/PreSession/ -PostSessionScriptDir=/etc/opt/gnome/gdm/PostSession/ -DisplayInitDir=/etc/opt/gnome/gdm/Init -XKeepsCrashing=/etc/opt/gnome/gdm/XKeepsCrashing -RebootCommand=/sbin/shutdown -r now -HaltCommand=/sbin/shutdown -h now -SuspendCommand=/usr/bin/powersave --suspend-to-disk -BaseXsession=/etc/opt/gnome/gdm/Xsession -SessionDesktopDir=/usr/share/xsessions/:/etc/X11/sessions/:\ -/etc/opt/gnome/dm/Sessions/:/opt/gnome/share/gdm/BuiltInSessions/:\ -$vmsessions -BaseXsession=/etc/opt/gnome/gdm/Xsession -UserAuthFBDir=/tmp -UserAuthFile=.Xauthority -StandardXServer=${D_XORGBIN} +kb -I -Xnest=/usr/X11R6/bin/Xnest -audit 0 -name Xnest - -[security] -AllowRoot=true -AllowRemoteRoot=true -AllowRemoteAutoLogin=false -CheckDirOwner=true -#UserMaxFile=65536 -RetryDelay=1 -#SessionMaxFile=524388 -NeverPlaceCookiesOnNFS=true - -[xdmcp] -Enable=$xdmcp -HonorIndirect=true -MaxPending=4 -MaxPendingIndirect=4 -MaxSessions=10 -MaxWait=15 -MaxWaitIndirect=15 -DisplaysPerHost=2 -Willing=/etc/X11/xdm/Xwilling - -[gui] -#MaxIconWidth=128 -#MaxIconWidth=128 - -[greeter] -Browser=false -#TitleBar=true -MinimalUID=500 -Quiver=true -Welcome=Welcome to %n -LockPosition=true -BackgroundImage=0 -BackgroundColor=#000000 -ShowGnomeFailsafeSession=false -ShowXtermFailsafeSession=false -ShowLastSession=false -Use24Clock=true -GraphicalTheme=GDM-SuSE -GraphicalTheme=circles -GraphicalThemeDir=/opt/gnome/share/gdm/themes/ -GraphicalThemeRand=false -#SystemMenu=true -InfoMsgFile=/opt/gnome/share/gdm/UserInfo -InfoMsgFont=monospace 10 -SoundOnLogin=false -[chooser] -HostImageDir=/opt/gnome/share/hosts/ -Broadcast=false -Multicast=false -Hosts=$xdmcp_hosts - -[debug] -Enable=$debug" >/mnt/etc/opt/gnome/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 - if [ ! -d /mnt/etc/opt/gnome/gdm ] ; then - testmkd /mnt/etc/opt/gnome/gdm - fi - 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 -fi -} -# configure kdm as display manager -config_kdm () { -config_dm_entry yes -# write configuration file -# use general config in /etc/functions -config_kdm_template -} - # configure bluetooth services config_bt () { if [ -e /mnt/etc/${D_SYSCONFDIR}/bluetooth ] ; then diff --git a/initramfs/distro-specs/ubuntu/config-default b/initramfs/distro-specs/ubuntu/config-default index 4f74f23c..246192f6 100644 --- a/initramfs/distro-specs/ubuntu/config-default +++ b/initramfs/distro-specs/ubuntu/config-default @@ -63,8 +63,3 @@ D_XORGBIN=/usr/X11R6/bin/X D_XFONTPATH="/usr/share/fonts/*" D_DEFAULTCOUNTRY="de" D_BOOTLOCAL="" - -# deprecated, moved to "desktop" plugin! Some of the preparations should -# be moved to the ubuntu "desktop.sh" script to be defined in ubuntu.pm -D_KDMRCPATH=/etc/kde3/kdm -D_XDMPATH=/etc/kde3/kdm diff --git a/initramfs/distro-specs/ubuntu/functions-6.06 b/initramfs/distro-specs/ubuntu/functions-6.06 index a8dc3b56..ca9eed98 100644 --- a/initramfs/distro-specs/ubuntu/functions-6.06 +++ b/initramfs/distro-specs/ubuntu/functions-6.06 @@ -23,24 +23,6 @@ preinit () { NFSRO="" } -# distro specific function called from servconfig script - -# x11 stuff -descsession () { -# variable desktop_session is most probably deprecated -if [ "x$desktop_session" != "x" ] ; then - windowmanagers="$desktop_session" -else - windowmanagers="kde,gnome,icewm,failsafe" -fi - -# 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 -} - # set up keytable (function run in hwautocfg) # fixme: is anything needed here - otherwise remove (and check that a # dummy function is present) diff --git a/initramfs/distro-specs/ubuntu/functions-6.10 b/initramfs/distro-specs/ubuntu/functions-6.10 index 0b5c19c0..76808347 100644 --- a/initramfs/distro-specs/ubuntu/functions-6.10 +++ b/initramfs/distro-specs/ubuntu/functions-6.10 @@ -50,13 +50,3 @@ sed -e "s,LANGUAGE=.*,LANGUAGE=${LANG},;s,LANG=.*,LANG=${LANG}," \ rllinker "console-screen.sh" 31 3 } -# configure kdm as display manager -config_kdm () { -rllinker "kdm" 3 1 -if [ "x$start_xdmcp" = "xkdm" ]; then - echo /usr/bin/kdm > /mnt/etc/X11/default-display-manager -fi -# write configuration file; use general config in /etc/functions -config_kdm_template -} - diff --git a/initramfs/distro-specs/ubuntu/functions-7.10 b/initramfs/distro-specs/ubuntu/functions-7.10 index e5b73fd2..479b58a0 100644 --- a/initramfs/distro-specs/ubuntu/functions-7.10 +++ b/initramfs/distro-specs/ubuntu/functions-7.10 @@ -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 -} - 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 -} - diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index 29cc3122..81eb5188 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -180,7 +180,6 @@ echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \ >>/mnt/etc/${D_INITDIR}/boot.slx } - # acpi and powersave config_acpi () { rllinker "acpid" 10 19 @@ -193,157 +192,6 @@ config_acpi () { rllinker "udev" 11 25 } -# deprecated, moved to "desktop" plugin! Some of the preparations should -# be moved to the ubuntu "desktop.sh" script to be defined in ubuntu.pm -# configure gdm as display manager -config_gdm () { -ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm -if [ "x$start_xdmcp" = "xgdm" ]; then - # existance is handled in Stage1 already!! - # 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/rc3.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 -} - -# configure kdm as display manager -config_kdm () { -rllinker "kdm" 25 1 -if [ "x$start_xdmcp" = "xkdm" ]; then - # configure fallback if no kdm binary is present - if ! binfinder kdm; then - config_gdm - # error "kdm configured but bin not found" nonfatal - else - echo $(binfinder kdm) >/mnt/etc/X11/default-display-manager - fi -fi -# write configuration file -# use general config in /etc/functions -config_kdm_template -} - # configure hal, dbus, resmgr and services like that config_dreshal () { if [ "x$start_dreshal" = "xyes" ]; then diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 928065a3..48b65a0a 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -322,151 +322,6 @@ if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then esac fi -############################################################################# -# X11/GUI stuff -if [ "x$start_x" != "xno" ] ; then - # creating directories commonly needed for X11 in all distros - # rest should be done via config_x11 function (distro specific) - for i in /var/lib/xkb/compiled \ - /etc/X11/xdm \ - /etc/X11/sessions \ - /var/X11R6/bin \ - /var/run/xdmctl \ - /tmp/.ICE-unix \ - /tmp/.X11-unix ; do testmkd /mnt/$i; done - chmod 1777 /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix - chown 0:0 /mnt/tmp/.ICE-unix /mnt/tmp/.X11-unix - echo "# file emtied by $0 during initramfs" > /mnt/etc/X11/xdm/Xservers - # define additional sessions offered to the user (via dhcp/ldap config) - # descsession -> deprecated by new vmware integration concept - # write available X display manager to /etc/X11/xdm/Xaccess - [ -n "$x_display_manager" ] && \ - echo -e "# /etc/X11/xdm/Xaccess - file generated by $0: \ -$date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\ - >/mnt/etc/X11/xdm/Xaccess - - # define type of X session - dsx="no" - case "$start_x" in - yes|YES|direct|DIRECT|query|QUERY) - # direct connection onto the own displaymanager, which - # should be enabled then -# [ "x$start_xdmcp" = "xno" ] && $start_xdmcp="yes" - init="" - dsx="yes" - xdmcp="false" - echo -e "# /etc/X11/Xservers - file generated by \ -$0: $date\n:0 local X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers - ;; - broadcast|BROADCAST) - # the client will XDMCP broadcast and choose first available - # X11 server - [ "x$start_xdmcp" = "xgdm" ] || \ - init="7:5:respawn:${D_XORGBIN} vt7 -quiet -broadcast" - ;; - indirect|INDIRECT) - # the client will try to XDMCP connect list of X11 servers - if [ "x$start_xdmcp" = "xgdm" ] ; then - init="" - else - init="7:5:respawn:${D_XORGBIN} vt7 -quiet -indirect $host_name" - fi - [ "x$start_xdmcp" = "xno" ] && start_xdmcp="yes" - xdmcp="true" - ;; - *) - # no display manager needed in kiosk mode - # in this mode you have to provide the type of X session to start - [ x$start_xdmcp != "x" ] || start_xdmcp="no"; - init="7:5:respawn:/var/X11R6/bin/kiosk /dev/tty7" - # nobody can halt pc - echo 'nobody ALL=NOPASSWD:/sbin/halt, /sbin/shutdown' >>/mnt/etc/sudoers - echo -e "#!/bin/sh\n# /var/X11R6/bin/kiosk - file generated by $0: $date - while ps aux|grep -i kiosk|grep -v \"grep\" &>/dev/null; do - test -f /var/run/kiosk || break; sleep 3; - done - touch /var/run/kiosk - for((i=0;\$i<=120;i=\$((\$i+1)))); do - [ -e /var/run/resmgr.pid ] && break - [ \$i = 120 ] && exit 1 - sleep 1 - done - resmgr login nobody tty8 \\ - && resmgr grant nobody desktop \\ - && chown -R nobody:nogroup /var/lib/nobody \\ - && (su -c '(sleep 10; amixer -q sset Master 28 unmute; \\ - amixer -q sset PCM 28 unmute) & - xinit /var/X11R6/bin/startgui $start_x \\ - -- vt7 -quiet' -l nobody &>/dev/null) - rm /var/run/kiosk - resmgr revoke nobody - resmgr logout tty7 - killall X" >/mnt/var/X11R6/bin/kiosk - # early start of kiosk session - echo -e "\t# kiosk start added by $0\n\t\ -/var/X11R6/bin/kiosk &>/dev/null &" >>/mnt/etc/${D_INITDIR}/boot.slx - cp /etc/startgui /mnt/var/X11R6/bin - chmod a+x /mnt/var/X11R6/bin/kiosk /mnt/var/X11R6/bin/startgui - rm /mnt/var/run/kiosk 2>/dev/null - ;; - esac - echo -e "# entry made by $0 $date\n$init" >> /mnt/etc/inittab - # most probably not needed any longer - if [ -n ${D_XORGBIN} ] ; then - testmkd /mnt/var/X11R6/bin - ln -sf ${D_XORGBIN} /mnt/var/X11R6/bin/X - fi -fi - -# setup requested display manager -if [ "x$start_xdmcp" != "xno" ] ; then - testmkd /mnt/var/lib/xdm/authdir/authfiles - testmkd /mnt/var/run/xdmctl - if [ "$start_xdmcp" = "yes" ] ; then - start_xdmcp=kdm - fi - # just ensure lowercase - start_xdmcp=$(echo $start_xdmcp|sed -e "y/'GKWXDM'/'gkwxdm'/") - case "$start_xdmcp" in - wdm) - # anywhere in use!? - ;; - kdm) - # config is most probably not common in all distros? - # distro specific function config_kdm - config_kdm - ;; - gdm) - # config is most probably not common in all distros? - # distro specific function config_gdm - config_gdm - ;; - *) - # setup xdm (should be the same over the several distros) - echo -e "# /etc/X11/xdm/xdm-config - file generated by\n\ -#\t$0: $date\n\nDisplayManager.errorLogFile:\t/var/log/xdm.errors\n\ -DisplayManager.pidFile:\t\t/var/run/xdm.pid\n\ -DisplayManager.authDir:\t\t/var/lib/xdm\n\ -DisplayManager.keyFile:\t\t/etc/X11/xdm/xdm-keys\n\ -DisplayManager.servers:\t\t/etc/X11/xdm/Xservers\n\ -DisplayManager.accessFile:\t/etc/X11/xdm/Xaccess\n\ -DisplayManager.willing:\t\tsu nobody -c /etc/X11/xdm/Xwilling\n\ -DisplayManager.*.authName:\tMIT-MAGIC-COOKIE-1\n\ -DisplayManager.*.authComplain:\tfalse\n\ -DisplayManager.*.setup:\t\t/etc/X11/xdm/Xsetup\n\ -DisplayManager.*.chooser:\t/etc/X11/xdm/RunChooser\n\ -DisplayManager.*.startup:\t/etc/X11/xdm/Xstartup\n\ -DisplayManager.*.session:\t/etc/X11/xdm/Xsession\n\ -DisplayManager.*.reset:\t\t/etc/X11/xdm/Xreset" \ - >/mnt/etc/X11/xdm/xdm-config - [ "$xdmcp" = "false" ] && echo -e \ - "DisplayManager.requestPort:\t0\n" >>/mnt/etc/X11/xdm/xdm-config - # distro specific function config_xdm (at least for runlevel links) - config_xdm - ;; - esac -fi - # script run timer [ $DEBUGLEVEL -eq 8 ] && echo "** SW setup finished at $(sysup)" diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index d2eb79b7..22e313f8 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -922,103 +922,6 @@ include_in_fsroot_union () { done } -# deprecated, moved to "desktop" plugin! Some of the preparations should -# be moved to the respective "desktop.sh" script to be defined in <distro>.pm -# kdmrc template started from distro specific functions files -config_kdm_template () { -testmkd /mnt/${D_KDMRCPATH} -testmkd /mnt/var/lib/openslx/themes/displaymanager -# check if a kdmrc was provided via ConfTGZ -[ -f /rootfs/${D_KDMRCPATH}/kdmrc ] || \ - echo -e "# ${D_KDMRCPATH}/kdmrc - \ -file generated by -#\t$0: $date\n\ -[General] -ConfigVersion=2.3 -StaticServers=:0 -ExportList=LANG -PidFile=/var/run/kdm.pid -AuthDir=/var/lib/xdm/authdir/authfiles -ServerVTs=-7 -ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6 -[Xdmcp] -Enable=$xdmcp -Xaccess=/${D_XDMPATH}/Xaccess -Willing=/${D_XDMPATH}/Xwilling -[Shutdown] -HaltCmd=/sbin/halt -RebootCmd=/sbin/reboot -[X-*-Core] -ServerCmd=${D_XORGBIN} -br -ServerArgsLocal=-nolisten tcp -TerminateServer=true -Resources=/${D_XDMPATH}/Xresources -Setup=/${D_XDMPATH}/Xsetup -UserPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/var/X11R6/bin -SystemPath=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:\ -/usr/X11R6/bin:/var/X11R6/bin -Startup=/${D_XDMPATH}/Xstartup -Reset=/${D_XDMPATH}/Xreset -Session=/${D_XDMPATH}/Xsession -ClientLogFile=.xsession-errors-%s -AutoReLogin=false -AllowRootLogin=true -AllowNullPasswd=true -AllowShutdown=All -SessionsDirs=/etc/X11/sessions,/usr/share/xsessions -AuthNames=XDM-AUTHORIZATION-1,MIT-MAGIC-COOKIE-1 -[X-*-Greeter] -ShowUsers=Selected -SelectedUsers= -UserList=false -GUIStyle=default -LogoArea=Clock -GreetString=Diskless Linux (%h) -GreetFont=Nimbus Sans l,20,-1,5,48,0,0,0,0,0 -StdFont=Nimbus Sans l,14,-1,5,48,0,0,0,0,0 -FailFont=Nimbus Sans l,14,-1,5,74,0,0,0,0,0 -AntiAliasing=true -Language=$lang -EchoMode=OneStar -ShowLog=false -UseTheme=false -Theme=/var/lib/openslx/themes/displaymanager/kdm -UseBackground=true -BackgroundCfg=/var/lib/openslx/themes/displaymanager/backgroundrc -[X-:*-Greeter] -PreselectUser=None -FocusPasswd=true -LoginMode=DefaultLocal -AllowClose=false -UseAdminSession=true -[X-:0-Core] -AutoLoginEnable=false -ClientLogFile=.xsession-errors -NoPassEnable=false -[X-:0-Greeter] -LogSource=/dev/xconsole -UseAdminSession=false" >/mnt/${D_KDMRCPATH}/kdmrc -echo -e "[Desktop0] -BackgroundMode=Flat -BlendBalance=100 -BlendMode=NoBlending -ChangeInterval=60 -Color1=0,51,102 -Color2=255,255,255 -CurrentWallpaper=0 -LastChange=0 -MinOptimizationDepth=1 -MultiWallpaperMode=NoMulti -Pattern=triangles -Program= -ReverseBlending=false -UseSHM=false -Wallpaper= -WallpaperList= -WallpaperMode=NoWallpaper" \ - >/mnt/var/lib/openslx/themes/displaymanager/backgroundrc -} - ############################################################################# # dummy functions - avoid undefined functions in servconfig (functions are # normally overwritten by settings within distro-functions) - a file @@ -1069,18 +972,6 @@ consolefont () { config_acpi () { : } -# configure xdm as display manager -config_xdm () { -: -} -# configure kdm as display manager -config_kdm () { -: -} -# configure gdm as display manager -config_gdm () { -: -} # configure hal, dbus, resmgr and services like that config_dreshal () { : diff --git a/initramfs/initrd-stuff/etc/startgui b/initramfs/initrd-stuff/etc/startgui deleted file mode 100755 index 37955a23..00000000 --- a/initramfs/initrd-stuff/etc/startgui +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# -# Description: startgui runs as script replacement for xinit -# -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 19-05-2006 -# Michael Janczyk, 28-09-2007 -# Copyright: (c) 2003, 2007 - RZ Universitaet Freiburg -# -# Version: 0.1.0c -# -# /var/X11R6/bin/startgui -# -########################################################################### - -WM=$1 -[ $WM ] || WM=kde -case "$WM" in - *fvwm*) - fvwm2 - ;; - *kde*) - startkde - ;; - *wmaker*|*windowmaker*) - wmaker - ;; - *ice*) - icewm - ;; - *gnome*) - gnome - ;; - *citrix|Citrix|ICAClient|*wfica) - wfica - ;; - *citrix-mgr|*citrix-indirect|*wfcmgr) - # - ;; - *vmware*) - /var/X11R6/bin/xdialog.sh - ;; - *) - if which $WM; then - $WM - error "Session ended ... Click OK to restart X" xmessage - else - error "Tried: $WM - Kein sinnvoller wm angegeb." xmessage - xterm - fi - ;; -esac -exit 0 diff --git a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm b/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm deleted file mode 100644 index 4487be87..00000000 --- a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright (c) 2007 - OpenSLX GmbH -# -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org/ -# ----------------------------------------------------------------------------- -# theme.pm -# - implementation of the 'theme' plugin, which applies theming to the -# following places: -# + bootsplash (via splashy) -# + displaymanager (gdm, kdm, ...) -# + desktop (to be done) -# ----------------------------------------------------------------------------- -package OpenSLX::OSPlugin::theme; - -use strict; -use warnings; - -use base qw(OpenSLX::OSPlugin::Base); - -use OpenSLX::Basics; -use OpenSLX::Utils; - -sub new -{ - my $class = shift; - - my $self = { - name => 'theme', - }; - - return bless $self, $class; -} - -sub getInfo -{ - my $self = shift; - - return { - description => unshiftHereDoc(<<' End-of-Here'), - Applies a graphical theme to the displaymanager. - End-of-Here - precedence => 40, - }; -} - -sub getAttrInfo -{ - my $self = shift; - - return { - 'theme::active' => { - applies_to_systems => 1, - applies_to_clients => 0, - description => unshiftHereDoc(<<' End-of-Here'), - should the 'theme'-plugin be executed during boot? - End-of-Here - content_regex => qr{^(0|1)$}, - content_descr => '1 means active - 0 means inactive', - default => '1', - }, - 'theme::displaymanager' => { - applies_to_systems => 1, - applies_to_clients => 0, - description => unshiftHereDoc(<<' End-of-Here'), - name of the theme to apply to displaymanager (unset for no theme) - End-of-Here - content_regex => undef, - content_descr => undef, - default => 'openslx', - }, - 'theme::desktop' => { - applies_to_systems => 1, - applies_to_clients => 0, - description => unshiftHereDoc(<<' End-of-Here'), - name of the theme to apply to desktop (unset for no theme) - End-of-Here - content_regex => undef, - content_descr => undef, - default => 'openslx', - }, - }; -} - -sub copyRequiredFilesIntoInitramfs -{ - my $self = shift; - my $targetPath = shift; - my $attrs = shift; - my $makeInitRamFSEngine = shift; - - my $themeDir = "$openslxConfig{'base-path'}/share/themes"; - - my $displayManagerTheme = $attrs->{'theme::displaymanager'} || ''; - if ($displayManagerTheme) { - my $displayManagerThemeDir - = "$themeDir/$displayManagerTheme/displaymanager"; - if (-d $displayManagerThemeDir) { - $makeInitRamFSEngine->addCMD( - "mkdir -p $targetPath/usr/share/themes" - ); - $makeInitRamFSEngine->addCMD( - "cp -a $displayManagerThemeDir $targetPath/usr/share/themes/" - ); - } - } - else { - $displayManagerTheme = '<none>'; - } - - vlog( - 1, - _tr( - "theme-plugin: displaymanager=%s", $displayManagerTheme) - ); - - return; -} - -1; diff --git a/os-plugins/plugins/theme/XX_theme.sh b/os-plugins/plugins/theme/XX_theme.sh deleted file mode 100644 index 765a16ce..00000000 --- a/os-plugins/plugins/theme/XX_theme.sh +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -# -# stage3 part of 'theme' plugin - the runlevel script -# -. /etc/functions -. /etc/distro-functions -. /etc/sysconfig/config -if [ -e /initramfs/plugin-conf/theme.conf ]; then - . /initramfs/plugin-conf/theme.conf - if [ $theme_active -ne 0 ]; then - [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'theme' os-plugin ..."; - - testmkd /mnt/var/lib/openslx/themes/displaymanager - testmkd /mnt/var/lib/openslx/bin - if [ -d /usr/share/themes/displaymanager ]; then - cp -a /usr/share/themes/displaymanager \ - /mnt/var/lib/openslx/themes - if [ -f /mnt/${D_KDMRCPATH}/kdmrc ]; then - sed -i "s,UseTheme=false,UseTheme=true," /mnt/${D_KDMRCPATH}/kdmrc - fi - if [ -f /mnt/etc/gdm/gdm.conf ]; then - sed -i "s,^\(GraphicalThemeDir=.*\)$,#\1 \nGraphicalThemeDir=/var/lib/openslx/themes/displaymanager," /mnt/etc/gdm/gdm.conf - sed -i "s,^\(GraphicalTheme=.*\)$,#\1 \nGraphicalTheme=gdm," /mnt/etc/gdm/gdm.conf - fi - fi - - [ $DEBUGLEVEL -gt 0 ] && echo "done with 'theme' os-plugin ..."; - fi -fi diff --git a/theming/openslx/displaymanager/GdmGreeterTheme.desktop b/theming/openslx/displaymanager/GdmGreeterTheme.desktop deleted file mode 100644 index 224692a1..00000000 --- a/theming/openslx/displaymanager/GdmGreeterTheme.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[GdmGreeterTheme] -Encoding=UTF-8 -Greeter=theme.xml -Name=OpenSLX KDM theme -Description=OpenSLX Theme based on Daemonic KDM theme for FreeBSD -Author=aceph <aceph@ventcore.net> and modified by MJanc -Copyright=Creative Commons -Screenshot=screenshot.png diff --git a/theming/openslx/displaymanager/color.png b/theming/openslx/displaymanager/color.png Binary files differdeleted file mode 100644 index 7a0feb03..00000000 --- a/theming/openslx/displaymanager/color.png +++ /dev/null diff --git a/theming/openslx/displaymanager/enter.png b/theming/openslx/displaymanager/enter.png Binary files differdeleted file mode 100644 index b646e851..00000000 --- a/theming/openslx/displaymanager/enter.png +++ /dev/null diff --git a/theming/openslx/displaymanager/enter_inactive.png b/theming/openslx/displaymanager/enter_inactive.png Binary files differdeleted file mode 100644 index e12cfb8e..00000000 --- a/theming/openslx/displaymanager/enter_inactive.png +++ /dev/null diff --git a/theming/openslx/displaymanager/environment.png b/theming/openslx/displaymanager/environment.png Binary files differdeleted file mode 100644 index b9682822..00000000 --- a/theming/openslx/displaymanager/environment.png +++ /dev/null diff --git a/theming/openslx/displaymanager/gdm/GdmGreeterTheme.desktop b/theming/openslx/displaymanager/gdm/GdmGreeterTheme.desktop deleted file mode 100755 index cb2fb30c..00000000 --- a/theming/openslx/displaymanager/gdm/GdmGreeterTheme.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[GdmGreeterTheme] -Encoding=UTF-8 -Greeter=openslx.xml -Name=OpenSLX GDM theme -Description=GDM Port of Daemonic KDM theme for FreeBSD -Author=MJanc / KDM by aceph <aceph@ventcore.net> -Copyright=Creative Commons -Screenshot=screenshot.png
\ No newline at end of file diff --git a/theming/openslx/displaymanager/gdm/color.png b/theming/openslx/displaymanager/gdm/color.png Binary files differdeleted file mode 100644 index 7a0feb03..00000000 --- a/theming/openslx/displaymanager/gdm/color.png +++ /dev/null diff --git a/theming/openslx/displaymanager/gdm/environment.png b/theming/openslx/displaymanager/gdm/environment.png Binary files differdeleted file mode 100644 index 7ad6783a..00000000 --- a/theming/openslx/displaymanager/gdm/environment.png +++ /dev/null diff --git a/theming/openslx/displaymanager/gdm/main-runner.png b/theming/openslx/displaymanager/gdm/main-runner.png Binary files differdeleted file mode 100644 index 5b3cf656..00000000 --- a/theming/openslx/displaymanager/gdm/main-runner.png +++ /dev/null diff --git a/theming/openslx/displaymanager/gdm/openslx-logo-main.png b/theming/openslx/displaymanager/gdm/openslx-logo-main.png Binary files differdeleted file mode 100644 index f98e6517..00000000 --- a/theming/openslx/displaymanager/gdm/openslx-logo-main.png +++ /dev/null diff --git a/theming/openslx/displaymanager/gdm/openslx-logo.png b/theming/openslx/displaymanager/gdm/openslx-logo.png Binary files differdeleted file mode 100644 index 8cfaaf94..00000000 --- a/theming/openslx/displaymanager/gdm/openslx-logo.png +++ /dev/null diff --git a/theming/openslx/displaymanager/gdm/openslx.xml b/theming/openslx/displaymanager/gdm/openslx.xml deleted file mode 100755 index 2a1708c3..00000000 --- a/theming/openslx/displaymanager/gdm/openslx.xml +++ /dev/null @@ -1,205 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE greeter SYSTEM "greeter.dtd"> -<greeter> - <item type="pixmap"> - <normal file="color.png"/> - <pos x="0" y="0" width="100%" height="100%"/> - <box orientation="vertical" homogeneous="true"> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="n" x="50%" y="0%" width="100%" height="80%"/> - <box orientation="vertical" homogeneous="true"> - - <item type="pixmap"> - <normal file="welcome-time-shadowed.png"/> - <pos anchor="n" x="50%" y="0" width="80%" height="44"/> - <box orientation="horizontal" homogeneous="true"> - - <!-- Wellcome on ... --> - <item type="label"> - <pos anchor="w" x="10%" y="30%"/> - <normal color="#f0f0f0" font="Sans 11"/> - <stock type="welcome-label"/> - </item> - - <!-- clock --> - <item type="label" id="clock"> - <pos anchor="e" x="90%" y="30%"/> - <normal color="#f0f0f0" font="Sans 11"/> - <text>%c</text> - </item> - - </box> - </item> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="c" x="50%" y="10%" width="100%" height="160%"/> - <box orientation="vertical" homogeneous="true"> - <item type="pixmap"> - <normal file="openslx-logo-main.png"/> - <pos anchor="c" x="50%" y="50%" height="box"/> - </item> - </box> - </item> - - </box> - </item> - - <item type="pixmap"> - <normal file="main-runner.png"/> - <pos anchor="c" x="50%" y="0%" width="100%" height="160"/> - <box orientation="horizontal" homogeneous="true"> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="w" x="0%" y="50%" width="100%" height="100%"/> - <box orientation="horizontal" homogeneous="true"> - - <item type="pixmap"> - <normal file="openslx-logo.png"/> - <pos anchor="c" x="70" y="50%"/> - </item> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="c" x="50" y="50%" width="100%" height="100%"/> - <box orientation="vertical" homogeneous="true"> - - <!-- username-label --> - <item type="label" id="pam-prompt"> - <pos anchor="sw" x="5" y="80%"/> - <normal color="#f0f0f0" font="Sans 11"/> - <stock type="username-label"/> - </item> - - - <!-- username-entry --> - <item type="entry" id="user-pw-entry"> - <normal color="#0f0f0f" font="Sans 11"/> - <pos anchor="nw" y="-10%" height="22" width="160"/> - </item> - - </box> - </item> - - </box> - </item> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="c" x="50%" y="50%" width="100%" height="100%"/> - <box orientation="vertical" homogeneous="true"> - - <item type="rect" id="caps-lock-warning"> - <normal color="#000000" alpha="0.4"/> - <pos anchor="c" x="50%" y="50%" width="100%" height="30"/> - <box orientation="vertical" homogeneous="true"> - - <item type="label"> - <normal color="#ff8b00" font="Sans 11"/> - <pos anchor="c" x="50%" y="50%"/> - <stock type="caps-lock-warning"/> - </item> - - </box> - </item> - - <item type="pixmap"> - <normal file="environment.png"/> - <pos anchor="c" x="50%" y="50%"/> - </item> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="c" x="50%" y="50%" width="100%" height="40"/> - <box orientation="vertical" homogeneous="true"> - <item type="label" id="pam-error"> - <normal color="#ff8b00" font="Sans 11"/> - <pos anchor="c" x="50%" y="50%"/> - <text/> - </item> - </box> - </item> - - </box> - </item> - - - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="e" x="100%" y="50%" width="100%" height="100%"/> - <box orientation="vertical" homogeneous="true"> - - <!-- session-button --> - <item type="rect" id="session_button" button="true"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="se" x="80%" y="95%" width="box" height="box"/> - <box orientation="horizontal"> - - <item type="label"> - <normal color="#bbbbbb" font="Sans 11"/> - <prelight color="#f0f0f0" font="Sans 11"/> - <active color="#ff8b00" font="Sans 11"/> - <pos anchor="e" x="100%" y="-24"/> - <text>Session</text> - <text xml:lang="en">Session</text> - <text xml:lang="de">Sitzung</text> - </item> - - <item type="rect" id="session_button" button="true"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="c" x="50%" y="50%" width="10"/> - </item> - - <item type="pixmap" id="session_button" button="true"> - <normal file="sessions_inactive.png"/> - <prelight file="sessions.png"/> - <pos anchor="se" x="100%" y="100%"/> - </item> - - </box> - </item> - - <!-- menu-button --> - <item type="rect" id="system_button" button="true"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="ne" x="80%" y="5%" width="box" height="box"/> - <box orientation="horizontal"> - - <item type="label"> - <normal color="#bbbbbb" font="Sans 11"/> - <prelight color="#f0f0f0" font="Sans 11"/> - <active color="#ff8b00" font="Sans 11"/> - <pos anchor="e" x="100%" y="24"/> - <text>System Menu</text> - <text xml:lang="en">System Menu</text> - <text xml:lang="de">System Menü</text> - </item> - - <item type="rect" id="session_button" button="true"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="c" x="50%" y="50%" width="10"/> - </item> - - <item type="pixmap" id="system_button" button="true"> - <normal file="system_inactive.png"/> - <prelight file="system.png"/> - <pos anchor="ne" x="100%" y="0%"/> - </item> - - </box> - </item> - - </box> - </item> - - </box> - </item> - - </box> - </item> - -</greeter> diff --git a/theming/openslx/displaymanager/gdm/sessions.png b/theming/openslx/displaymanager/gdm/sessions.png Binary files differdeleted file mode 100644 index 00d05f29..00000000 --- a/theming/openslx/displaymanager/gdm/sessions.png +++ /dev/null diff --git a/theming/openslx/displaymanager/gdm/sessions_inactive.png b/theming/openslx/displaymanager/gdm/sessions_inactive.png Binary files differdeleted file mode 100644 index 86bbe642..00000000 --- a/theming/openslx/displaymanager/gdm/sessions_inactive.png +++ /dev/null diff --git a/theming/openslx/displaymanager/gdm/system.png b/theming/openslx/displaymanager/gdm/system.png Binary files differdeleted file mode 100644 index f7b9e71f..00000000 --- a/theming/openslx/displaymanager/gdm/system.png +++ /dev/null diff --git a/theming/openslx/displaymanager/gdm/system_inactive.png b/theming/openslx/displaymanager/gdm/system_inactive.png Binary files differdeleted file mode 100644 index c3e1719b..00000000 --- a/theming/openslx/displaymanager/gdm/system_inactive.png +++ /dev/null diff --git a/theming/openslx/displaymanager/gdm/welcome-time-shadowed.png b/theming/openslx/displaymanager/gdm/welcome-time-shadowed.png Binary files differdeleted file mode 100644 index 79e872c3..00000000 --- a/theming/openslx/displaymanager/gdm/welcome-time-shadowed.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/GdmGreeterTheme.desktop b/theming/openslx/displaymanager/kdm/GdmGreeterTheme.desktop deleted file mode 100644 index 224692a1..00000000 --- a/theming/openslx/displaymanager/kdm/GdmGreeterTheme.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[GdmGreeterTheme] -Encoding=UTF-8 -Greeter=theme.xml -Name=OpenSLX KDM theme -Description=OpenSLX Theme based on Daemonic KDM theme for FreeBSD -Author=aceph <aceph@ventcore.net> and modified by MJanc -Copyright=Creative Commons -Screenshot=screenshot.png diff --git a/theming/openslx/displaymanager/kdm/color.png b/theming/openslx/displaymanager/kdm/color.png Binary files differdeleted file mode 100644 index 7a0feb03..00000000 --- a/theming/openslx/displaymanager/kdm/color.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/enter.png b/theming/openslx/displaymanager/kdm/enter.png Binary files differdeleted file mode 100644 index b646e851..00000000 --- a/theming/openslx/displaymanager/kdm/enter.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/enter_inactive.png b/theming/openslx/displaymanager/kdm/enter_inactive.png Binary files differdeleted file mode 100644 index e12cfb8e..00000000 --- a/theming/openslx/displaymanager/kdm/enter_inactive.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/environment.png b/theming/openslx/displaymanager/kdm/environment.png Binary files differdeleted file mode 100644 index b9682822..00000000 --- a/theming/openslx/displaymanager/kdm/environment.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/main-runner.png b/theming/openslx/displaymanager/kdm/main-runner.png Binary files differdeleted file mode 100644 index 5b3cf656..00000000 --- a/theming/openslx/displaymanager/kdm/main-runner.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/openslx-logo-main.png b/theming/openslx/displaymanager/kdm/openslx-logo-main.png Binary files differdeleted file mode 100644 index f98e6517..00000000 --- a/theming/openslx/displaymanager/kdm/openslx-logo-main.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/openslx-logo.png b/theming/openslx/displaymanager/kdm/openslx-logo.png Binary files differdeleted file mode 100644 index 8cfaaf94..00000000 --- a/theming/openslx/displaymanager/kdm/openslx-logo.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/sessions.png b/theming/openslx/displaymanager/kdm/sessions.png Binary files differdeleted file mode 100644 index 00d05f29..00000000 --- a/theming/openslx/displaymanager/kdm/sessions.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/sessions_inactive.png b/theming/openslx/displaymanager/kdm/sessions_inactive.png Binary files differdeleted file mode 100644 index 86bbe642..00000000 --- a/theming/openslx/displaymanager/kdm/sessions_inactive.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/system.png b/theming/openslx/displaymanager/kdm/system.png Binary files differdeleted file mode 100644 index f7b9e71f..00000000 --- a/theming/openslx/displaymanager/kdm/system.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/system_inactive.png b/theming/openslx/displaymanager/kdm/system_inactive.png Binary files differdeleted file mode 100644 index c3e1719b..00000000 --- a/theming/openslx/displaymanager/kdm/system_inactive.png +++ /dev/null diff --git a/theming/openslx/displaymanager/kdm/theme.xml b/theming/openslx/displaymanager/kdm/theme.xml deleted file mode 100644 index 437f988f..00000000 --- a/theming/openslx/displaymanager/kdm/theme.xml +++ /dev/null @@ -1,200 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE greeter SYSTEM "greeter.dtd"> -<greeter> - <!-- main pic, login pic --> - <item type="pixmap"> - <normal file="color.png"/> - <pos x="0" y="0" width="100%" height="100%"/> - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="n" x="50%" y="0" width="100%" height="40%"/> - - <item type="pixmap"> - <normal file="welcome-time-shadowed.png"/> - <pos anchor="n" x="50%" y="0" width="80%" height="44"/> - - <!-- Wellcome on ... --> - <item type="label"> - <pos anchor="w" x="5%" y="33%"/> - <normal color="#f0f0f0" font="Sans 12"/> - <stock type="welcome-label"/> - </item> - - <!-- clock --> - <item type="label" id="clock"> - <normal color="#f0f0f0" font="Sans 12"/> - <pos anchor="e" x="95%" y="33%"/> - <text>%c</text> - </item> - - </item> - - <item type="pixmap"> - <normal file="openslx-logo-main.png"/> - <pos anchor="n" x="50%" y="20%" height="70%"/> - </item> - - </item> - - <item type="pixmap"> - <normal file="main-runner.png"/> - <pos anchor="c" x="50%" y="50%" width="100%" height="160"/> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="w" x="0" y="50%" width="35%" height="100%"/> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="w" x="0" y="50%" width="120" height="100%"/> - <item type="pixmap"> - <normal file="openslx-logo.png"/> - <pos anchor="e" x="100%" y="50%"/> - </item> - </item> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="e" x="-140" y="50%" width="100%" height="100%"/> - - <!-- username-label --> - <item type="label"> - <pos anchor="e" x="-5" y="40%"/> - <normal color="#f0f0f0" font="Sans 11"/> - <stock type="username-label"/> - </item> - - <!-- password-label --> - <item type="label"> - <pos anchor="e" x="-5" y="60%"/> - <normal color="#f0f0f0" font="Sans 11"/> - <stock type="password-label"/> - </item> - - </item> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="e" x="100%" y="50%" width="140" height="100%"/> - - <!-- username-entry --> - <item type="entry" id="user-entry"> - <pos anchor="w" x="0" y="40%" height="22" width="114"/> - </item> - - <!-- password-entry --> - <item type="entry" id="pw-entry"> - <pos anchor="w" x="0" y="60%" height="22" width="114"/> - </item> - - <item type="pixmap" button="true" id="login_button"> - <pos anchor="e" x="100%" y="60%" height="22" width="22"/> - <normal file="enter_inactive.png"/> - <prelight file="enter.png"/> - </item> - - </item> - - </item> - - <item type="rect"> - <normal color="#ff0000" alpha="0.0"/> - <pos anchor="c" x="50%" y="50%" width="30%" height="160"/> - - <!-- capslock-warning --> - <item type="pixmap" id="caps-lock-warning"> - <normal file="error.png"/> - <pos anchor="c" x="50%" y="22" width="100%" height="70"/> - <item type="rect" id="caps-lock-warning"> - <normal color="#000000" alpha="0.4"/> - <pos anchor="c" x="50%" y="50%" width="100%" height="box"/> - <box orientation="vertical" xpadding="10" ypadding="5" spacing="0"> - <item type="label"> - <normal color="#ff8b00" font="Sans 11"/> - <pos x="50%" anchor="n"/> - <stock type="caps-lock-warning"/> - </item> - </box> - </item> - </item> - - <item type="pixmap"> - <normal file="environment.png"/> - <pos anchor="c" x="50%" y="50%" width="186" height="100"/> - </item> - - <!-- Login-Error --> - <item type="pixmap" id="pam-error"> - <normal file="error.png"/> - <pos anchor="c" x="50%" y="-22" width="100%" height="70"/> - <item type="rect"> - <normal color="#000000" alpha="0.4"/> - <pos anchor="c" x="50%" y="50%" width="100%" height="box"/> - <box orientation="vertical" xpadding="10" ypadding="5" spacing="0"> - <item type="label"> - <normal color="#ff8b00" font="Sans 11"/> - <pos anchor="n" x="50%"/> - <text>Login failed!</text> - <text xml:lang="en">Login failed!</text> - <text xml:lang="de">Login fehlgeschlagen!</text> - </item> - </box> - </item> - </item> - - </item> - - <!-- icons and text on the left --> - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="e" x="100%" y="50%" width="35%" height="100%"/> - - <!-- session-button --> - <item type="rect" id="session_button" button="true"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="se" x="80%" y="50%" width="160" height="50%"/> - - <item type="pixmap" id="session_button" button="true"> - <normal file="sessions_inactive.png"/> - <prelight file="sessions.png"/> - <pos anchor="se" x="94%" y="-8" width="48" height="48"/> - </item> - - <item type="label"> - <normal color="#bbbbbb" font="Sans 11"/> - <prelight color="#f0f0f0" font="Sans 11"/> - <active color="#ff8b00" font="Sans 11"/> - <pos anchor="e" x="-70" y="-32"/> - <text>Session</text> - <text xml:lang="en">Session</text> - <text xml:lang="de">Sitzung</text> - </item> - - </item> - - <!-- menu-button --> - <item type="rect" id="system_button" button="true"> - <show modes="console" type="system"/> - <normal color="#000000" alpha="0.0"/> - <pos anchor="ne" x="80%" y="50%" width="160" height="50%"/> - <item type="pixmap" id="system_button" button="true"> - <normal file="system_inactive.png"/> - <prelight file="system.png"/> - <pos anchor="ne" x="94%" y="8" width="48" height="48"/> - </item> - <item type="label"> - <normal color="#bbbbbb" font="Sans 11"/> - <prelight color="#f0f0f0" font="Sans 11"/> - <active color="#ff8b00" font="Sans 11"/> - <pos anchor="e" x="-70" y="32"/> - <text>System Menu</text> - <text xml:lang="en">System Menu</text> - <text xml:lang="de">System Menü</text> - </item> - </item> - - </item> - - </item> - </item> -</greeter> diff --git a/theming/openslx/displaymanager/kdm/welcome-time-shadowed.png b/theming/openslx/displaymanager/kdm/welcome-time-shadowed.png Binary files differdeleted file mode 100644 index 79e872c3..00000000 --- a/theming/openslx/displaymanager/kdm/welcome-time-shadowed.png +++ /dev/null diff --git a/theming/openslx/displaymanager/main-runner.png b/theming/openslx/displaymanager/main-runner.png Binary files differdeleted file mode 100644 index 5b3cf656..00000000 --- a/theming/openslx/displaymanager/main-runner.png +++ /dev/null diff --git a/theming/openslx/displaymanager/openslx-logo-main.png b/theming/openslx/displaymanager/openslx-logo-main.png Binary files differdeleted file mode 100644 index f98e6517..00000000 --- a/theming/openslx/displaymanager/openslx-logo-main.png +++ /dev/null diff --git a/theming/openslx/displaymanager/openslx-logo.png b/theming/openslx/displaymanager/openslx-logo.png Binary files differdeleted file mode 100644 index 8cfaaf94..00000000 --- a/theming/openslx/displaymanager/openslx-logo.png +++ /dev/null diff --git a/theming/openslx/displaymanager/sessions.png b/theming/openslx/displaymanager/sessions.png Binary files differdeleted file mode 100644 index 00d05f29..00000000 --- a/theming/openslx/displaymanager/sessions.png +++ /dev/null diff --git a/theming/openslx/displaymanager/sessions_inactive.png b/theming/openslx/displaymanager/sessions_inactive.png Binary files differdeleted file mode 100644 index 86bbe642..00000000 --- a/theming/openslx/displaymanager/sessions_inactive.png +++ /dev/null diff --git a/theming/openslx/displaymanager/system.png b/theming/openslx/displaymanager/system.png Binary files differdeleted file mode 100644 index f7b9e71f..00000000 --- a/theming/openslx/displaymanager/system.png +++ /dev/null diff --git a/theming/openslx/displaymanager/system_inactive.png b/theming/openslx/displaymanager/system_inactive.png Binary files differdeleted file mode 100644 index c3e1719b..00000000 --- a/theming/openslx/displaymanager/system_inactive.png +++ /dev/null diff --git a/theming/openslx/displaymanager/theme.xml b/theming/openslx/displaymanager/theme.xml deleted file mode 100644 index 238dc834..00000000 --- a/theming/openslx/displaymanager/theme.xml +++ /dev/null @@ -1,200 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE greeter SYSTEM "greeter.dtd"> -<greeter> - <!-- main pic, login pic --> - <item type="pixmap"> - <normal file="color.png"/> - <pos x="0" y="0" width="100%" height="100%"/> - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="n" x="50%" y="0" width="100%" height="40%"/> - - <item type="pixmap"> - <normal file="welcome-time-shadowed.png"/> - <pos anchor="n" x="50%" y="0" width="80%" height="44"/> - - <!-- Wellcome on ... --> - <item type="label"> - <pos anchor="w" x="5%" y="33%"/> - <normal color="#f0f0f0" font="Sans 12"/> - <stock type="welcome-label"/> - </item> - - <!-- clock --> - <item type="label" id="clock"> - <normal color="#f0f0f0" font="Sans 12"/> - <pos anchor="e" x="95%" y="33%"/> - <text>%c</text> - </item> - - </item> - - <item type="pixmap"> - <normal file="openslx-logo-main.png"/> - <pos anchor="n" x="50%" y="20%" height="70%"/> - </item> - - </item> - - <item type="pixmap"> - <normal file="main-runner.png"/> - <pos anchor="c" x="50%" y="50%" width="100%" height="160"/> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="w" x="0" y="50%" width="35%" height="100%"/> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="w" x="0" y="50%" width="120" height="100%"/> - <item type="pixmap"> - <normal file="openslx-logo.png"/> - <pos anchor="e" x="100%" y="50%"/> - </item> - </item> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="e" x="-140" y="50%" width="100%" height="100%"/> - - <!-- username-label --> - <item type="label"> - <pos anchor="e" x="-5" y="40%"/> - <normal color="#f0f0f0" font="Sans 11"/> - <stock type="username-label"/> - </item> - - <!-- password-label --> - <item type="label"> - <pos anchor="e" x="-5" y="60%"/> - <normal color="#f0f0f0" font="Sans 11"/> - <stock type="password-label"/> - </item> - - </item> - - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="e" x="100%" y="50%" width="140" height="100%"/> - - <!-- username-entry --> - <item type="entry" id="user-entry"> - <pos anchor="w" x="0" y="40%" height="22" width="140"/> - </item> - - <!-- password-entry --> - <item type="entry" id="pw-entry"> - <pos anchor="w" x="0" y="60%" height="22" width="114"/> - </item> - - <item type="pixmap" button="true" id="login_button"> - <pos anchor="e" x="100%" y="60%" height="22" width="22"/> - <normal file="enter_inactive.png"/> - <prelight file="enter.png"/> - </item> - - </item> - - </item> - - <item type="rect"> - <normal color="#ff0000" alpha="0.0"/> - <pos anchor="c" x="50%" y="50%" width="30%" height="160"/> - - <!-- capslock-warning --> - <item type="pixmap" id="caps-lock-warning"> - <normal file="error.png"/> - <pos anchor="c" x="50%" y="22" width="100%" height="70"/> - <item type="rect" id="caps-lock-warning"> - <normal color="#000000" alpha="0.4"/> - <pos anchor="c" x="50%" y="50%" width="100%" height="box"/> - <box orientation="vertical" xpadding="10" ypadding="5" spacing="0"> - <item type="label"> - <normal color="#ff8b00" font="Sans 11"/> - <pos x="50%" anchor="n"/> - <stock type="caps-lock-warning"/> - </item> - </box> - </item> - </item> - - <item type="pixmap"> - <normal file="environment.png"/> - <pos anchor="c" x="50%" y="50%" width="186" height="100"/> - </item> - - <!-- Login-Error --> - <item type="pixmap" id="pam-error"> - <normal file="error.png"/> - <pos anchor="c" x="50%" y="-22" width="100%" height="70"/> - <item type="rect"> - <normal color="#000000" alpha="0.4"/> - <pos anchor="c" x="50%" y="50%" width="100%" height="box"/> - <box orientation="vertical" xpadding="10" ypadding="5" spacing="0"> - <item type="label"> - <normal color="#ff8b00" font="Sans 11"/> - <pos anchor="n" x="50%"/> - <text>Login failed!</text> - <text xml:lang="en">Login failed!</text> - <text xml:lang="de">Login fehlgeschlagen!</text> - </item> - </box> - </item> - </item> - - </item> - - <!-- icons and text on the left --> - <item type="rect"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="e" x="100%" y="50%" width="35%" height="100%"/> - - <!-- session-button --> - <item type="rect" id="session_button" button="true"> - <normal color="#000000" alpha="0.0"/> - <pos anchor="se" x="80%" y="50%" width="160" height="50%"/> - - <item type="pixmap" id="session_button" button="true"> - <normal file="sessions_inactive.png"/> - <prelight file="sessions.png"/> - <pos anchor="se" x="94%" y="-8" width="48" height="48"/> - </item> - - <item type="label"> - <normal color="#bbbbbb" font="Sans 11"/> - <prelight color="#f0f0f0" font="Sans 11"/> - <active color="#ff8b00" font="Sans 11"/> - <pos anchor="e" x="-70" y="-32"/> - <text>Session</text> - <text xml:lang="en">Session</text> - <text xml:lang="de">Sitzung</text> - </item> - - </item> - - <!-- menu-button --> - <item type="rect" id="system_button" button="true"> - <show modes="console" type="system"/> - <normal color="#000000" alpha="0.0"/> - <pos anchor="ne" x="80%" y="50%" width="160" height="50%"/> - <item type="pixmap" id="system_button" button="true"> - <normal file="system_inactive.png"/> - <prelight file="system.png"/> - <pos anchor="ne" x="94%" y="8" width="48" height="48"/> - </item> - <item type="label"> - <normal color="#bbbbbb" font="Sans 11"/> - <prelight color="#f0f0f0" font="Sans 11"/> - <active color="#ff8b00" font="Sans 11"/> - <pos anchor="e" x="-70" y="32"/> - <text>System Menu</text> - <text xml:lang="en">System Menu</text> - <text xml:lang="de">System Menü</text> - </item> - </item> - - </item> - - </item> - </item> -</greeter> diff --git a/theming/openslx/displaymanager/welcome-time-shadowed.png b/theming/openslx/displaymanager/welcome-time-shadowed.png Binary files differdeleted file mode 100644 index 79e872c3..00000000 --- a/theming/openslx/displaymanager/welcome-time-shadowed.png +++ /dev/null |
