diff options
Diffstat (limited to 'initramfs/initrd-stuff')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 145 | ||||
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 109 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/etc/startgui | 52 |
3 files changed, 0 insertions, 306 deletions
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 |