From 68f83408cab2a524b7bd5fb66a9518e5b0abc3f9 Mon Sep 17 00:00:00 2001 From: (no author) Date: Tue, 12 Sep 2006 14:51:00 +0000 Subject: theming should work now. bad hack, but works ok for first relase ;) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@371 95ad53e4-c205-0410-b2fa-d234c58c8868 --- Makefile | 13 +++- initrd/initrd-stuff/bin/servconfig | 18 ++++-- initrd/mkdxsinitrd | 13 ++-- .../bootsplash/config/bootsplash-640x480.cfg | 8 +-- theming/openslx/kdm/kdmrc | 72 ++++++++++++++++++++++ theming/openslx/kdmrc | 72 ---------------------- vmware/defaultwm | 12 ++-- 7 files changed, 113 insertions(+), 95 deletions(-) create mode 100644 theming/openslx/kdm/kdmrc delete mode 100644 theming/openslx/kdmrc diff --git a/Makefile b/Makefile index b52ccc01..f971ee8c 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ # # Lars Mueller , 2006 # Dirk von Suchodoletz , 2006 +# mj0, 12-09-2006 - vmware + theming # # (c) 2006 - OpenSLX.com @@ -13,6 +14,7 @@ SLX_CONFIG_PATH=/etc/opt/openslx SLX_PRIVATE_PATH=/var/opt/openslx SLX_PUBLIC_PATH=/srv/openslx SLX_SHARE_PATH=/opt/openslx/share +VMWARE_PATH=/opt/openslx/vmware tarball: @OPENSLX_SVN_SNAPSHOT=$$( echo $${OPENSLX_SVN_SNAPSHOT} | \ @@ -55,7 +57,8 @@ install: -p $(SLX_PRIVATE_PATH)/config/default/rootfs \ -p $(SLX_PRIVATE_PATH)/db \ -p $(SLX_PRIVATE_PATH)/stage1 \ - -p $(SLX_PUBLIC_PATH)/tftpboot + -p $(SLX_PUBLIC_PATH)/tftpboot \ + -p $(SLX_SHARE_PATH)/themes @cp initrd/{mkdxsinitrd,slxmkramfs} $(SLX_BIN_PATH) @chmod u+x $(SLX_BIN_PATH)/{mkdxsinitrd,slxmkramfs} @ln -sf $(SLX_BIN_PATH)/mkdxsinitrd $(USR_BIN)/ @@ -65,6 +68,7 @@ install: @cp -a installer/default_files/machine-setup.default \ $(SLX_SHARE_PATH)/templates @cp -a installer/default_files/tftpboot $(SLX_SHARE_PATH) + @cp -a theming/* $(SLX_SHARE_PATH)/themes @echo -e "#!/bin/sh\n#\n# This script allows the local admin to \ extend the\n# capabilities at the beginning of the initramfs (stage3). \ The toolset is rather\n# restricted and you have to keep in mind that \ @@ -85,6 +89,13 @@ functions via\# inclusion: '. /etc/functions' ..." \ @chmod a+w $(SLX_PUBLIC_PATH)/tftpboot @chmod a+w $(SLX_PRIVATE_PATH)/db +vmware_install: + @echo "Installing VMware files to $(VMWARE_PATH)" + @mkdir -p $(VMWARE_PATH)/templ \ + -p $(VMWARE_PATH)/vmsessions + @cp -a vmware/* $(VMWARE_PATH)/templ/ + @echo -e "Please configure your exports (add $(VMWARE_PATH) to your list).\nCopy your *.vmdk files into $(VMWARE_PATH). For interactive mode add for each virtual machine (*.vmdk) a .desktop file into ./vmsessions (example file $(VMWARE_PATH)/templ/desktop.template)." + #uninstall: # @echo -e "Uninstalling openslx.org project files but keeping configs \ #and stage1\nfiles (please remove manually)" diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 0dd15760..8228773f 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -5,7 +5,7 @@ # system is setup when servconfig starts # # Dirk von Suchodoletz , 03-09-2006 -# Michael Janczyk , 08-09-2006 +# Michael Janczyk , 12-09-2006 # Lars Mueller , 23-06-2006 # Oliver Tappe , 23-06-2006 # @@ -316,10 +316,16 @@ Name[de]=Standard\nExec=defaultwm\nTryExec=/var/X11R6/bin/defaultwm\n\ Type=Application" >/mnt/etc/X11/sessions/default.desktop rm /mnt/etc/vmware/not_configured 2>/dev/null echo -e "#!/bin/sh\n#\n# file generated by ${0} at ${date}\ - \n# set to black background\nxsetroot -solid \"black\"\ + \n# set X background\ + \nres=\$(xvidtune -show | grep -wo \"\\\".*\\\"\" | sed \"s/\\\"//g\")\ + \nif ! [ -f /var/lib/vmware/templ/corp-id/bootsplash/silent-\${res}.jpg ]; then + \n img=\$(ls /etc/bootsplash/themes/dxs/images/ | grep -m 1 \"silent\")\ + \n display -window root /var/lib/vmware/templ/corp-id/bootsplash/images/\${img}\ + \nelse\ + \n display -window root /var/lib/vmware/templ/corp-id/bootsplash/images/silent-\${res}.jpg\ + \nfi \nstartvm=\$(echo \$0 | sed -e \"s,.*/,,\")\ - \nxterm -bg black -fg white -geometry 100x30+0-0 +sb \ - -e \"/var/X11R6/bin/runvmware -s \${startvm}\"\n" \ + \n/var/X11R6/bin/runvmware -s \${startvm}\n"\ > /mnt/var/X11R6/bin/desktop-session #${debug} removed chmod 755 /mnt/var/X11R6/bin/runvmware /mnt/var/X11R6/bin/defaultwm \ /mnt/var/X11R6/bin/desktop-session >/dev/null 2>&1 @@ -501,9 +507,9 @@ DisplayManager.*.reset:\t\t/etc/X11/xdm/Xreset" \ fi # theming -mkdir -p /mnt/usr/share/themes/openslx +mkdir -p /mnt/var/lib/openslx/themes cp -a /usr/share/themes/kdm /usr/share/themes/Xdialog \ - /usr/share/themes/bootsplash /mnt/usr/share/themes/openslx >/dev/null 2>&1 + /usr/share/themes/bootsplash /mnt/var/lib/openslx/themes >/dev/null 2>&1 cp /usr/share/themes/kdm/kdmrc /mnt/etc/opt/kde3/share/config/kdm >/dev/null 2>&1 # script run timer diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd index acab08e8..4e151ae0 100755 --- a/initrd/mkdxsinitrd +++ b/initrd/mkdxsinitrd @@ -7,12 +7,12 @@ # Author(s): Dirk von Suchodoletz , 03-09-2006 # Nico Dietrich # Felix Endres -# mj0, 08-09-2006 +# mj0, 12-09-2006 theming added # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg # (c) 2006 - openslx.org project # -# Version: 0.4.5c +# Version: 0.4.5d # debug level of script itself DEBUG=1 @@ -236,8 +236,8 @@ splash_bin=$(chroot $ROOTDIR which splash) if [ -n "$splashsizes" -a -n "$splash_bin" ]; then themes_dir="../theming/openslx/bootsplash" - if [ -d "/usr/share/openslx/themes/${theme}/bootsplash" ]; then - themes_dir="/usr/share/openslx/themes/${theme}/bootsplash" + if [ -d "/opt/openslx/share/themes/${theme}/bootsplash" ]; then + themes_dir="/opt/openslx/share/themes/${theme}/bootsplash" elif [ -d "$ROOTDIR/etc/bootsplash/themes/${theme}" ]; then themes_dir="/etc/bootsplash/themes/${theme}" elif [ -d "$ROOTDIR/usr/share/splash/themes/${theme}" ]; then @@ -246,7 +246,8 @@ if [ -n "$splashsizes" -a -n "$splash_bin" ]; then #fixme: very ugly ;) mkdir -p $ROOTDIR/tmp/bootsplash - cp -a $themes_dir/* $ROOTDIR/tmp/bootsplash/ + cp -a $themes_dir/* $ROOTDIR/tmp/bootsplash + themes=${themes_dir} themes_dir=$ROOTDIR/tmp/bootsplash if [ -n "$themes_dir" -a \ @@ -278,7 +279,7 @@ done rm -rf $ROOTDIR/tmp/bootsplash # kdm/Xdialog theme -cp -a ../theming/${theme}/* ${INSTDIR}/usr/share/themes +cp -a ${themes%bootsplash}* ${INSTDIR}/usr/share/themes } diff --git a/theming/openslx/bootsplash/config/bootsplash-640x480.cfg b/theming/openslx/bootsplash/config/bootsplash-640x480.cfg index 9232ff1c..a5f1c3c9 100644 --- a/theming/openslx/bootsplash/config/bootsplash-640x480.cfg +++ b/theming/openslx/bootsplash/config/bootsplash-640x480.cfg @@ -1,5 +1,5 @@ # This is a bootsplash configuration file for -# SUSE Linux 10.1, resolution 800x600. +# SUSE Linux 10.1, resolution 640x480. # # See www.bootsplash.org for more information. # Written by Jakub Steiner @@ -15,14 +15,14 @@ bgcolor=0 tx=20 ty=60 -tw=770 -th=540 +tw=610 +th=420 jpeg=/etc/bootsplash/themes/dxs/images/bootsplash-640x480.jpg silentjpeg=/etc/bootsplash/themes/dxs/images/silent-640x480.jpg -mnganim anim /etc/bootsplash/themes/dxs/animations/spinner.mng silent center 400 480 scale 800:1600 +mnganim anim /etc/bootsplash/themes/dxs/animations/spinner.mng silent center 320 384 scale 640:1600 trigger silent play anim trigger "isdown" quit diff --git a/theming/openslx/kdm/kdmrc b/theming/openslx/kdm/kdmrc new file mode 100644 index 00000000..723cec0e --- /dev/null +++ b/theming/openslx/kdm/kdmrc @@ -0,0 +1,72 @@ +# /etc/opt/kde3/share/config/kdm/kdmrc +# file copied by /bin/servconfig +[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=false +Xaccess=/etc/X11/xdm/Xaccess +Willing=/etc/X11/xdm/Xwilling +[Shutdown] +HaltCmd=/sbin/halt +RebootCmd=/sbin/reboot + +[X-*-Core] +ServerCmd=/usr/X11R6/bin/X -br +ServerArgsLocal=-nolisten tcp +TerminateServer=true +Resources=/etc/X11/xdm/Xresources +Setup=/etc/X11/xdm/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=/etc/X11/xdm/Xstartup +Reset=/etc/X11/xdm/Xreset +Session=/etc/X11/xdm/Xsession +ClientLogFile=.xsession-errors-%s +AutoReLogin=false +AllowRootLogin=true +AllowNullPasswd=true +AllowShutdown=All +SessionsDirs=/etc/X11/sessions,/usr/share/xsessions,/opt/kde3/share/apps/kdm/sessions,/var/lib/vmware/vmsessions +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= +EchoMode=OneStar +ShowLog=false +UseTheme=true +Theme=/var/lib/openslx/themes/kdm +UseBackground=false +BackgroundCfg=/etc/opt/kde3/share/config/kdm/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 diff --git a/theming/openslx/kdmrc b/theming/openslx/kdmrc deleted file mode 100644 index 20db5d3f..00000000 --- a/theming/openslx/kdmrc +++ /dev/null @@ -1,72 +0,0 @@ -# /etc/opt/kde3/share/config/kdm/kdmrc - file generated by -# /bin/servconfig: 09-08-2006 -[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=false -Xaccess=/etc/X11/xdm/Xaccess -Willing=/etc/X11/xdm/Xwilling -[Shutdown] -HaltCmd=/sbin/halt -RebootCmd=/sbin/reboot - -[X-*-Core] -ServerCmd=/usr/X11R6/bin/X -br -ServerArgsLocal=-nolisten tcp -TerminateServer=true -Resources=/etc/X11/xdm/Xresources -Setup=/etc/X11/xdm/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=/etc/X11/xdm/Xstartup -Reset=/etc/X11/xdm/Xreset -Session=/etc/X11/xdm/Xsession -ClientLogFile=.xsession-errors-%s -AutoReLogin=false -AllowRootLogin=true -AllowNullPasswd=true -AllowShutdown=All -SessionsDirs=/etc/X11/sessions,/usr/share/xsessions,/opt/kde3/share/apps/kdm/sessions,/var/lib/vmware/vmsessions -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= -EchoMode=OneStar -ShowLog=false -UseTheme=true -Theme=/usr/share/themes/openslx/kdm -UseBackground=false -BackgroundCfg=/etc/opt/kde3/share/config/kdm/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 diff --git a/vmware/defaultwm b/vmware/defaultwm index eb0b6993..bc7e05f3 100755 --- a/vmware/defaultwm +++ b/vmware/defaultwm @@ -2,11 +2,11 @@ # # Description: Session chooser for kdm/gdm # -# Author(s): Michael Janczyk , 08-09-2006 +# Author(s): Michael Janczyk , 12-09-2006 # # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # -# Version: 0.1.363 +# Version: 0.1.371 # ################################################################################ @@ -16,11 +16,11 @@ # set X background res=$(xvidtune -show | grep -wo "\".*\"" | sed "s/\"//g") -if ! [ -f /usr/share/themes/openslx/bootsplash/images/silent-${res}.jpg ]; then - img=$(ls /usr/share/themes/openslx/images/ | grep -m 1 "silent") - display -window root /usr/share/themes/openslx/bootsplash/images/${img} +if ! [ -f /var/lib/openslx/themes/bootsplash/images/silent-${res}.jpg ]; then + img=$(ls /var/lib/openslx/themes/bootsplash/images/ | grep -m 1 "silent") + display -window root /var/lib/openslx/themes/bootsplash/images/${img} else - display -window root /usr/share/themes/openslx/bootsplash/images/silent-${res}.jpg + display -window root /var/lib/openslx/themes/bootsplash/images/silent-${res}.jpg fi -- cgit v1.2.3-55-g7522