From 459bb734cb9b5a8abfe0e5ccb10d7986fa16ad7d Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Mon, 18 Sep 2006 11:51:07 +0000 Subject: Updated scripts for new path scheme (''opt'' prefix, see BootRootVerzeichnisse too), renamed a subdirectory in theming for convenience ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@379 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initrd/mkdxsinitrd | 32 ++-- installer/default_files/machine-setup.default | 4 +- installer/distro-specs/exclude-suse-10.1 | 4 +- installer/ld4-inst | 4 +- theming/openslx/displaymanager/Background.jpeg | Bin 0 -> 91541 bytes .../openslx/displaymanager/GdmGreeterTheme.desktop | 8 + theming/openslx/displaymanager/dots.png | Bin 0 -> 231 bytes theming/openslx/displaymanager/dxs.png | Bin 0 -> 1402 bytes theming/openslx/displaymanager/enter.png | Bin 0 -> 608 bytes theming/openslx/displaymanager/industrial.xml | 207 +++++++++++++++++++++ theming/openslx/displaymanager/kdmrc | 72 +++++++ theming/openslx/displaymanager/opendiskless.png | Bin 0 -> 1882 bytes theming/openslx/kdm/Background.jpeg | Bin 91541 -> 0 bytes theming/openslx/kdm/GdmGreeterTheme.desktop | 8 - theming/openslx/kdm/dots.png | Bin 231 -> 0 bytes theming/openslx/kdm/dxs.png | Bin 1402 -> 0 bytes theming/openslx/kdm/enter.png | Bin 608 -> 0 bytes theming/openslx/kdm/industrial.xml | 207 --------------------- theming/openslx/kdm/kdmrc | 72 ------- theming/openslx/kdm/opendiskless.png | Bin 1882 -> 0 bytes 20 files changed, 310 insertions(+), 308 deletions(-) create mode 100644 theming/openslx/displaymanager/Background.jpeg create mode 100644 theming/openslx/displaymanager/GdmGreeterTheme.desktop create mode 100644 theming/openslx/displaymanager/dots.png create mode 100644 theming/openslx/displaymanager/dxs.png create mode 100644 theming/openslx/displaymanager/enter.png create mode 100644 theming/openslx/displaymanager/industrial.xml create mode 100644 theming/openslx/displaymanager/kdmrc create mode 100644 theming/openslx/displaymanager/opendiskless.png delete mode 100644 theming/openslx/kdm/Background.jpeg delete mode 100644 theming/openslx/kdm/GdmGreeterTheme.desktop delete mode 100644 theming/openslx/kdm/dots.png delete mode 100644 theming/openslx/kdm/dxs.png delete mode 100644 theming/openslx/kdm/enter.png delete mode 100644 theming/openslx/kdm/industrial.xml delete mode 100644 theming/openslx/kdm/kdmrc delete mode 100644 theming/openslx/kdm/opendiskless.png diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd index 2b6141b4..10b96647 100755 --- a/initrd/mkdxsinitrd +++ b/initrd/mkdxsinitrd @@ -4,7 +4,7 @@ # ramdisks for linux diskless clients (stage2 system # setup) # -# Author(s): Dirk von Suchodoletz , 03-09-2006 +# Author(s): Dirk von Suchodoletz , 18-09-2006 # Nico Dietrich # Felix Endres # mj0, 13-09-2006 theming added @@ -62,7 +62,7 @@ D_DEFAULTCOUNTRY="" usage() { echo -e "mkdxsinitrd [-bgh] [-k kernel version] [-i path/file] \ -[-f module(s)] [-n module(s)] [-r path] [-s splashsize]\n" +[-f module(s)] [-n module(s)] [-r path] [-s theme]\n" echo "OPTIONEN" echo " -g Benutze glibc als Basisbibliothek in der ramdisk." echo " -b Use busybox instead of separate binaries." @@ -85,7 +85,7 @@ usage() echo " -r path" echo " Pfad zum Wurzelverzeichnis des zu exportierenden Betriebsystems" echo " (z.B. /export/10.1)." - echo " -s screensize (for splash)" + echo " -s theme (for splash)" echo " -d debug (add special modules to initramfs)" echo " -D Name" echo " Name der Distribution der Betriebsystemvorlage" @@ -296,7 +296,7 @@ while getopts :bhgk:i:r:o:s:f:n:Sut:d:v:I:V:a: a ; do f) echo "-f requires file system module list parameter";; n) echo "-n requires network module list parameter";; r) echo "-r requires root dir parameter";; - s) echo "-s requires image size(s)";; + s) echo "-s may require theme name";; t) echo "-t requires tmp dir parameter";; d) echo "-d requires debug level (integer)";; D) echo "-D requires linux Distribution name";; @@ -660,15 +660,15 @@ chmod 755 ${INSTDIR}/init \ # add the common default client configuration file - just to ensure to # have all major variables defined. !!These settings are most probably # are overwritten by fileget in stage3 within initramfs!! -if [ -f /var/lib/openslx/config/default/initramfs/machine-setup ] ; then - cp /var/lib/openslx/config/default/initramfs/machine-setup \ +if [ -f /var/opt/openslx/config/default/initramfs/machine-setup ] ; then + cp /var/opt/openslx/config/default/initramfs/machine-setup \ ${INSTDIR}/etc/machine-setup - echo "Using /var/lib/openslx/config/default/initramfs/machine-setup" + echo "Using /var/opt/openslx/config/default/initramfs/machine-setup" # use the installed default machine-setup.default -elif [ -f /usr/share/openslx/templates/machine-setup.default ] ; then - cp /usr/share/openslx/templates/machine-setup.default \ +elif [ -f /opt/openslx/share/templates/machine-setup.default ] ; then + cp /opt/openslx/share/templates/machine-setup.default \ ${INSTDIR}/etc/machine-setup - echo "Using /usr/share/openslx/templates/machine-setup.default" + echo "Using /opt/openslx/share/templates/machine-setup.default" # just compatibility for older versions elif [ -f /etc/dxs/client.cfg/machine-setup.default ] ; then cp /etc/dxs/client.cfg/machine-setup.default \ @@ -691,12 +691,12 @@ fi # custom hardware configuration files pcitable.local and Cards.local # fixme!! New source for these files (instead of templates)! -if [ -f /usr/share/openslx/templates/pcitable.local ] ; then - cat /usr/share/openslx/templates/pcitable.local >> \ +if [ -f /opt/openslx/share/templates/pcitable.local ] ; then + cat /opt/openslx/share/templates/pcitable.local >> \ ${INSTDIR}/usr/share/hwdata/pcitable fi -if [ -f /usr/share/openslx/templates/Cards.local ] ; then - cat /usr/share/openslx/templates/Cards.local >> \ +if [ -f /opt/openslx/share/templates/Cards.local ] ; then + cat /opt/openslx/share/templates/Cards.local >> \ ${INSTDIR}/usr/share/hwdata/Cards fi @@ -707,8 +707,8 @@ for cfg in default/initramfs/preinit.local \ ${DISTRO}-${DISTRO_VER}/initramfs/preinit.local \ default/initramfs/postinit.local \ ${DISTRO}-${DISTRO_VER}/initramfs/postinit.local ; do - test -f /var/lib/openslx/config/$cfg && \ - cp /var/lib/openslx/config/$cfg ${INSTDIR}/bin + test -f /var/opt/openslx/config/$cfg && \ + cp /var/opt/openslx/config/$cfg ${INSTDIR}/bin done # remove unneeded debug info, fixme not really tested yet diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default index b5dc0faa..86a6b7d6 100644 --- a/installer/default_files/machine-setup.default +++ b/installer/default_files/machine-setup.default @@ -81,14 +81,14 @@ netbios_workgroup="dxs-network" # automounter home (/local_dir - top level directories only) and source # (format (proto://)server/path) #automnt_dir="/home" -#automnt_src="$serverip/home" +#automnt_src="serverip/home" # scratch space on server "proto://serverip/dxs/tmp" #scratch="(proto://)serverip/dxs/tmp" # configure and start vmware services vmware="no" -#vmware="(proto://)$serverip/dxs/vmware" +#vmware="(proto://)serverip/dxs/vmware" # imgsrv is deprecated, because incorporated into vmware variable # kind of X11 display manager to run diff --git a/installer/distro-specs/exclude-suse-10.1 b/installer/distro-specs/exclude-suse-10.1 index b26e6e0a..1fbc52ad 100644 --- a/installer/distro-specs/exclude-suse-10.1 +++ b/installer/distro-specs/exclude-suse-10.1 @@ -4,6 +4,7 @@ - *.YaST2save - *.old - *.bak +- *.o - /lib/klibc/events/* - /boot/initrd* - /boot/grub @@ -22,7 +23,6 @@ - /var/lib/gdm/* - /var/lib/dhcp* - /var/lib/xdm -- /var/lib/zypp - /var/adm/backup/rpmdb/* - /usr/share/vmware/* - *lost+found* @@ -32,3 +32,5 @@ - /opt/kde3/share/autostart/profile_chooser-autostart.desktop - /opt/kde3/share/autostart/knetworkmanager-autostart.desktop - /opt/kde3/share/autostart/zen-updater-auto.desktop +- /opt/kde3/share/autostart/beagled.desktop +- /opt/gnome/share/autostart/beagle*.desktop diff --git a/installer/ld4-inst b/installer/ld4-inst index 686f168b..cd0fa676 100755 --- a/installer/ld4-inst +++ b/installer/ld4-inst @@ -4,7 +4,7 @@ # cloning from rsync source for Diskless X Stations (v4.0) # # Author(s): Nico Dietrich, 04-04-2006 -# Dirk von Suchodoletz , 07-09-2006 +# Dirk von Suchodoletz , 18-09-2006 # Michael Janczyk, , 06-07-2006 # # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg @@ -533,7 +533,7 @@ dxs_atftpd_conf="atftpd/atftpd" dxs_exports_conf="nfs/exports" dxs_pxedefault_conf="pxelinux/default" # config directory for the client side -dxs_cl_dir="/var/lib/openslx/config/default/initramfs" +dxs_cl_dir="/var/opt/openslx/config/default/initramfs" dxs_client_conf="machine-setup.pls-configure" diff --git a/theming/openslx/displaymanager/Background.jpeg b/theming/openslx/displaymanager/Background.jpeg new file mode 100644 index 00000000..aaa14205 Binary files /dev/null and b/theming/openslx/displaymanager/Background.jpeg differ diff --git a/theming/openslx/displaymanager/GdmGreeterTheme.desktop b/theming/openslx/displaymanager/GdmGreeterTheme.desktop new file mode 100644 index 00000000..4b388c24 --- /dev/null +++ b/theming/openslx/displaymanager/GdmGreeterTheme.desktop @@ -0,0 +1,8 @@ +[GdmGreeterTheme] +Encoding=UTF-8 +Greeter=industrial.xml +Name=Code10 Industrial +Description=Default Code 10 Theme +Author=Jakub Steiner +Copyright=(c) 2006 Novell, Inc. +Screenshot=screenshot.png diff --git a/theming/openslx/displaymanager/dots.png b/theming/openslx/displaymanager/dots.png new file mode 100644 index 00000000..5dc6c26d Binary files /dev/null and b/theming/openslx/displaymanager/dots.png differ diff --git a/theming/openslx/displaymanager/dxs.png b/theming/openslx/displaymanager/dxs.png new file mode 100644 index 00000000..7f42ac1b Binary files /dev/null and b/theming/openslx/displaymanager/dxs.png differ diff --git a/theming/openslx/displaymanager/enter.png b/theming/openslx/displaymanager/enter.png new file mode 100644 index 00000000..91eabe54 Binary files /dev/null and b/theming/openslx/displaymanager/enter.png differ diff --git a/theming/openslx/displaymanager/industrial.xml b/theming/openslx/displaymanager/industrial.xml new file mode 100644 index 00000000..d5c67c8e --- /dev/null +++ b/theming/openslx/displaymanager/industrial.xml @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/theming/openslx/displaymanager/kdmrc b/theming/openslx/displaymanager/kdmrc new file mode 100644 index 00000000..8f3575ff --- /dev/null +++ b/theming/openslx/displaymanager/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/kdm +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/displaymanager/opendiskless.png b/theming/openslx/displaymanager/opendiskless.png new file mode 100644 index 00000000..b4806622 Binary files /dev/null and b/theming/openslx/displaymanager/opendiskless.png differ diff --git a/theming/openslx/kdm/Background.jpeg b/theming/openslx/kdm/Background.jpeg deleted file mode 100644 index aaa14205..00000000 Binary files a/theming/openslx/kdm/Background.jpeg and /dev/null differ diff --git a/theming/openslx/kdm/GdmGreeterTheme.desktop b/theming/openslx/kdm/GdmGreeterTheme.desktop deleted file mode 100644 index 4b388c24..00000000 --- a/theming/openslx/kdm/GdmGreeterTheme.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[GdmGreeterTheme] -Encoding=UTF-8 -Greeter=industrial.xml -Name=Code10 Industrial -Description=Default Code 10 Theme -Author=Jakub Steiner -Copyright=(c) 2006 Novell, Inc. -Screenshot=screenshot.png diff --git a/theming/openslx/kdm/dots.png b/theming/openslx/kdm/dots.png deleted file mode 100644 index 5dc6c26d..00000000 Binary files a/theming/openslx/kdm/dots.png and /dev/null differ diff --git a/theming/openslx/kdm/dxs.png b/theming/openslx/kdm/dxs.png deleted file mode 100644 index 7f42ac1b..00000000 Binary files a/theming/openslx/kdm/dxs.png and /dev/null differ diff --git a/theming/openslx/kdm/enter.png b/theming/openslx/kdm/enter.png deleted file mode 100644 index 91eabe54..00000000 Binary files a/theming/openslx/kdm/enter.png and /dev/null differ diff --git a/theming/openslx/kdm/industrial.xml b/theming/openslx/kdm/industrial.xml deleted file mode 100644 index d5c67c8e..00000000 --- a/theming/openslx/kdm/industrial.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/theming/openslx/kdm/kdmrc b/theming/openslx/kdm/kdmrc deleted file mode 100644 index 8f3575ff..00000000 --- a/theming/openslx/kdm/kdmrc +++ /dev/null @@ -1,72 +0,0 @@ -# /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/kdm -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/kdm/opendiskless.png b/theming/openslx/kdm/opendiskless.png deleted file mode 100644 index b4806622..00000000 Binary files a/theming/openslx/kdm/opendiskless.png and /dev/null differ -- cgit v1.2.3-55-g7522