diff options
| -rwxr-xr-x | initrd/mkdxsinitrd | 32 | ||||
| -rw-r--r-- | installer/default_files/machine-setup.default | 4 | ||||
| -rw-r--r-- | installer/distro-specs/exclude-suse-10.1 | 4 | ||||
| -rwxr-xr-x | installer/ld4-inst | 4 | ||||
| -rw-r--r-- | theming/openslx/displaymanager/Background.jpeg (renamed from theming/openslx/kdm/Background.jpeg) | bin | 91541 -> 91541 bytes | |||
| -rw-r--r-- | theming/openslx/displaymanager/GdmGreeterTheme.desktop (renamed from theming/openslx/kdm/GdmGreeterTheme.desktop) | 0 | ||||
| -rw-r--r-- | theming/openslx/displaymanager/dots.png (renamed from theming/openslx/kdm/dots.png) | bin | 231 -> 231 bytes | |||
| -rw-r--r-- | theming/openslx/displaymanager/dxs.png (renamed from theming/openslx/kdm/dxs.png) | bin | 1402 -> 1402 bytes | |||
| -rw-r--r-- | theming/openslx/displaymanager/enter.png (renamed from theming/openslx/kdm/enter.png) | bin | 608 -> 608 bytes | |||
| -rw-r--r-- | theming/openslx/displaymanager/industrial.xml (renamed from theming/openslx/kdm/industrial.xml) | 0 | ||||
| -rw-r--r-- | theming/openslx/displaymanager/kdmrc (renamed from theming/openslx/kdm/kdmrc) | 0 | ||||
| -rw-r--r-- | theming/openslx/displaymanager/opendiskless.png (renamed from theming/openslx/kdm/opendiskless.png) | bin | 1882 -> 1882 bytes |
12 files changed, 23 insertions, 21 deletions
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 <dirk@goe.net>, 03-09-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-09-2006 # Nico Dietrich # Felix Endres # mj0, 13-09-2006 theming added @@ -62,7 +62,7 @@ D_DEFAULTCOUNTRY="<set in ~/distro-config/distro file>" 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 <dirk@goe.net>, 07-09-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 18-09-2006 # Michael Janczyk, <mj0>, 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/kdm/Background.jpeg b/theming/openslx/displaymanager/Background.jpeg Binary files differindex aaa14205..aaa14205 100644 --- a/theming/openslx/kdm/Background.jpeg +++ b/theming/openslx/displaymanager/Background.jpeg diff --git a/theming/openslx/kdm/GdmGreeterTheme.desktop b/theming/openslx/displaymanager/GdmGreeterTheme.desktop index 4b388c24..4b388c24 100644 --- a/theming/openslx/kdm/GdmGreeterTheme.desktop +++ b/theming/openslx/displaymanager/GdmGreeterTheme.desktop diff --git a/theming/openslx/kdm/dots.png b/theming/openslx/displaymanager/dots.png Binary files differindex 5dc6c26d..5dc6c26d 100644 --- a/theming/openslx/kdm/dots.png +++ b/theming/openslx/displaymanager/dots.png diff --git a/theming/openslx/kdm/dxs.png b/theming/openslx/displaymanager/dxs.png Binary files differindex 7f42ac1b..7f42ac1b 100644 --- a/theming/openslx/kdm/dxs.png +++ b/theming/openslx/displaymanager/dxs.png diff --git a/theming/openslx/kdm/enter.png b/theming/openslx/displaymanager/enter.png Binary files differindex 91eabe54..91eabe54 100644 --- a/theming/openslx/kdm/enter.png +++ b/theming/openslx/displaymanager/enter.png diff --git a/theming/openslx/kdm/industrial.xml b/theming/openslx/displaymanager/industrial.xml index d5c67c8e..d5c67c8e 100644 --- a/theming/openslx/kdm/industrial.xml +++ b/theming/openslx/displaymanager/industrial.xml diff --git a/theming/openslx/kdm/kdmrc b/theming/openslx/displaymanager/kdmrc index 8f3575ff..8f3575ff 100644 --- a/theming/openslx/kdm/kdmrc +++ b/theming/openslx/displaymanager/kdmrc diff --git a/theming/openslx/kdm/opendiskless.png b/theming/openslx/displaymanager/opendiskless.png Binary files differindex b4806622..b4806622 100644 --- a/theming/openslx/kdm/opendiskless.png +++ b/theming/openslx/displaymanager/opendiskless.png |
