examples/disklserver/tftp: Adapt tftp configuration example (disklserver) to Debian Edu jessie.

93 files changed, 142 insertions, 159 deletions

diff --git a/examples/disklserver/README.tftp b/examples/disklserver/README.tftp
index 2fe8a76..8b22f68 100644
--- a/examples/disklserver/README.tftp
+++ b/examples/disklserver/README.tftp
@@ -1,6 +1,6 @@
-This folder contains a PXE boot environment that provides the
+This folder contains a PXE boot environments that provides the
 boot menu for diskless workstations as provided by a standalone
-Debian Edu based diskless chroot image server.
+Debian Edu based diskless chroot image server (aka disklserver).
 
 Installation steps:
 
diff --git a/examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg b/examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg
new file mode 100644
index 0000000..87bc738
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/debian-edu/localboot-generic.cfg
@@ -0,0 +1,4 @@
+# German
+LABEL localboot-generic
+       MENU LABEL Von Festplatte ^starten
+       localboot 0
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/localboot.cfg b/examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg
index 0146c56..dc38819 100644
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/localboot.cfg
+++ b/examples/disklserver/tftp/_common_/debian-edu/localboot-mswin.cfg
@@ -1,5 +1,4 @@
 # German
-LABEL localboot
+LABEL localboot-mswin
        MENU LABEL MS ^Windows starten
-       MENU DEFAULT
        localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg
new file mode 100644
index 0000000..0cc9de8
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-jessie.cfg
@@ -0,0 +1,8 @@
+LABEL ltsp-diskless-jessie
+        MENU LABEL ^Diskless Workstation (Debian Edu 8.0)
+        MENU DEFAULT
+        KERNEL ltsp/i386.jessie/vmlinuz
+        APPEND initrd=ltsp/i386.jessie/initrd.img init=/sbin/init-ltsp nfsroot=/opt/ltsp/i386.jessie,v3,tcp,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet ipappend 2
+
+
+
diff --git a/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-squeeze.cfg b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-squeeze.cfg
new file mode 100644
index 0000000..8561984
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/debian-edu/ltsp-diskless-squeeze.cfg
@@ -0,0 +1,8 @@
+LABEL ltsp-diskless-squeeze
+        MENU LABEL ^Diskless Workstation (Debian Edu 6.0)
+        MENU DEFAULT
+        KERNEL ltsp/i386.squeeze/vmlinuz
+        APPEND initrd=ltsp/i386.squeeze/initrd.img nfsroot=/opt/ltsp/i386.squeeze,v3,tcp,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet
+
+
+
diff --git a/examples/disklserver/tftp/_common_/debian-edu/memtest.cfg b/examples/disklserver/tftp/_common_/debian-edu/memtest.cfg
new file mode 100644
index 0000000..8bf162a
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/debian-edu/memtest.cfg
@@ -0,0 +1,6 @@
+LABEL memtest86+
+        MENU    LABEL  Speichertest (memtest86+)
+        kernel  debian-edu/memtest86+.bin
+LABEL memtest86
+        MENU    LABEL  Speichertest (memtest86)
+        kernel  debian-edu/memtest86.bin
diff --git a/examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg b/examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg
new file mode 100644
index 0000000..ed5660d
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/debian-edu/mint-workstation.cfg
@@ -0,0 +1,3 @@
+LABEL mint-workstation
+       MENU LABEL Linux Mint
+       localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg b/examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg
new file mode 100644
index 0000000..798b022
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/debian-edu/skolelinux-workstation.cfg
@@ -0,0 +1,3 @@
+LABEL skolelinux-workstation
+       MENU LABEL Debian Edu/Skolelinux Arbeitsstation
+       localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg b/examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg
new file mode 100644
index 0000000..11dc813
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/debian-edu/ubuntu-workstation.cfg
@@ -0,0 +1,3 @@
+LABEL ubuntu-workstation
+       MENU LABEL Ubuntu GNU/Linux
+       localboot 0
diff --git a/examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg
new file mode 100644
index 0000000..18ccd4c
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/debian-edu/x2go-tce.cfg
@@ -0,0 +1,4 @@
+LABEL x2go-tce
+        MENU LABEL  ^X2Go Thin Client (i486)
+        KERNEL x2go/i386/vmlinuz
+        APPEND initrd=x2go/i386/initrd.img nfsroot=/opt/x2gothinclient/chroot,v3,tcp,intr,rsize=1048576,wsize=1048576 boot=nfs ro quiet
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386.jessie/initrd.img b/examples/disklserver/tftp/_common_/ltsp/i386.jessie/initrd.img
new file mode 120000
index 0000000..6894bac
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/ltsp/i386.jessie/initrd.img
@@ -0,0 +1 @@
+/srv/ltsp/i386.jessie/boot/initrd.img
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386.jessie/vmlinuz b/examples/disklserver/tftp/_common_/ltsp/i386.jessie/vmlinuz
new file mode 120000
index 0000000..3c6e043
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/ltsp/i386.jessie/vmlinuz
@@ -0,0 +1 @@
+/srv/ltsp/i386.jessie/boot/vmlinuz
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/initrd.img b/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/initrd.img
new file mode 120000
index 0000000..ce21bae
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/initrd.img
@@ -0,0 +1 @@
+/srv/ltsp/i386.squeeze/boot/initrd.img
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/vmlinuz b/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/vmlinuz
new file mode 120000
index 0000000..e0521ef
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/ltsp/i386.squeeze/vmlinuz
@@ -0,0 +1 @@
+/srv/ltsp/i386.squeeze/boot/vmlinuz
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386/gpxelinux.0 b/examples/disklserver/tftp/_common_/ltsp/i386/gpxelinux.0
deleted file mode 120000
index 6e777d1..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386/gpxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/gpxelinux.0
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386/initrd.img b/examples/disklserver/tftp/_common_/ltsp/i386/initrd.img
deleted file mode 120000
index b7b0322..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386/initrd.img
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/i386/boot/initrd.img
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386/memtest86+.bin b/examples/disklserver/tftp/_common_/ltsp/i386/memtest86+.bin
deleted file mode 120000
index aea3158..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386/memtest86+.bin
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/i386/boot/memtest86+.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386/memtest86+_multiboot.bin b/examples/disklserver/tftp/_common_/ltsp/i386/memtest86+_multiboot.bin
deleted file mode 120000
index 327278f..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386/memtest86+_multiboot.bin
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/i386/boot/memtest86+_multiboot.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386/memtest86.bin b/examples/disklserver/tftp/_common_/ltsp/i386/memtest86.bin
deleted file mode 120000
index ea683b2..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386/memtest86.bin
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/i386/boot/memtest86.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386/nbi.img b/examples/disklserver/tftp/_common_/ltsp/i386/nbi.img
deleted file mode 120000
index 50c232c..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386/nbi.img
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/i386/boot/nbi.img
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386/vmlinuz b/examples/disklserver/tftp/_common_/ltsp/i386/vmlinuz
deleted file mode 120000
index 954f0b9..0000000
--- a/examples/disklserver/tftp/_common_/ltsp/i386/vmlinuz
+++ /dev/null
@@ -1 +0,0 @@
-/srv/ltsp/i386/boot/vmlinuz
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/pxelinux.0 b/examples/disklserver/tftp/_common_/pxelinux.0
deleted file mode 120000
index 0f93aef..0000000
--- a/examples/disklserver/tftp/_common_/pxelinux.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/pxelinux.0
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.0 b/examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.0
new file mode 120000
index 0000000..f723d02
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/pxelinux/jessie/pxelinux.0
@@ -0,0 +1 @@
+/usr/lib/PXELINUX/pxelinux.0
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/ltsp/i386/pxelinux.0 b/examples/disklserver/tftp/_common_/pxelinux/squeeze/pxelinux.0
index 0f93aef..0f93aef 120000
--- a/examples/disklserver/tftp/_common_/ltsp/i386/pxelinux.0
+++ b/examples/disklserver/tftp/_common_/pxelinux/squeeze/pxelinux.0
diff --git a/examples/disklserver/tftp/_common_/syslinux/jessie/syslinux b/examples/disklserver/tftp/_common_/syslinux/jessie/syslinux
new file mode 120000
index 0000000..7bea767
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/syslinux/jessie/syslinux
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/syslinux/squeeze/syslinux b/examples/disklserver/tftp/_common_/syslinux/squeeze/syslinux
new file mode 120000
index 0000000..e76fbf5
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/syslinux/squeeze/syslinux
@@ -0,0 +1 @@
+/usr/lib/syslinux/
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/x2go/i386/initrd.img b/examples/disklserver/tftp/_common_/x2go/i386/initrd.img
new file mode 120000
index 0000000..4f0f0b5
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/x2go/i386/initrd.img
@@ -0,0 +1 @@
+/opt/x2gothinclient/chroot/boot/initrd.img
\ No newline at end of file
diff --git a/examples/disklserver/tftp/_common_/x2go/i386/vmlinuz b/examples/disklserver/tftp/_common_/x2go/i386/vmlinuz
new file mode 120000
index 0000000..74fb488
--- /dev/null
+++ b/examples/disklserver/tftp/_common_/x2go/i386/vmlinuz
@@ -0,0 +1 @@
+/opt/x2gothinclient/chroot/boot/vmlinuz
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg
index d57b0c9..1420069 100644
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg
+++ b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg
@@ -1,8 +1,7 @@
-include debian-edu/localboot.cfg
+include debian-edu/localboot-generic.cfg
 MENU SEPARATOR
-include debian-edu/ltsp-diskless.cfg
-MENU SEPARATOR
-include debian-edu/x2go-tce.cfg
+include debian-edu/ltsp-diskless-jessie.cfg
+#include debian-edu/x2go-tce.cfg
 MENU SEPARATOR
 include debian-edu/memtest.cfg
 
@@ -11,6 +10,7 @@ menu width 72
 menu background debian-edu/debian-edu-splash.png
 menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
 menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default debian-edu/vesamenu.c32
+default syslinux/vesamenu.c32
 prompt 0
 timeout 100
+ontimeout localboot-generic
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg
new file mode 120000
index 0000000..08a2e34
--- /dev/null
+++ b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg
@@ -0,0 +1 @@
+../../_common_/debian-edu/localboot-generic.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot.cfg
deleted file mode 100644
index e6e3aed..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-# English
-#LABEL localboot
-#        MENU LABEL Boot from ^local harddrive
-#        localboot 0
-#
-
-# German
-LABEL localboot
-       MENU LABEL Von ^lokaler Festplatte starten
-       localboot 0
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg
new file mode 120000
index 0000000..209d4f9
--- /dev/null
+++ b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg
@@ -0,0 +1 @@
+../../_common_/debian-edu/ltsp-diskless-jessie.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless.cfg
deleted file mode 100644
index 10cd82f..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-LABEL ltsp-diskless
-        MENU LABEL  ^Diskless Workstation
-        MENU DEFAULT
-        KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=/opt/ltsp/i386 boot=nfs ro quiet 2 ipappend splash
-
-
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin
index 7cc1baf..1b74cce 120000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin
+++ b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin
@@ -1 +1 @@
-../../_common_/ltsp/i386/memtest86+.bin
\ No newline at end of file
+/boot/memtest86+.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin
index a49566a..2596a63 120000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin
+++ b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin
@@ -1 +1 @@
-../../_common_/ltsp/i386/memtest86.bin
\ No newline at end of file
+/boot/memtest86.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/vesamenu.c32 b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/vesamenu.c32
deleted file mode 120000
index d06c444..0000000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/vesamenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg
index a5304d7..6f7e32a 100644..120000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg
+++ b/examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg
@@ -1,4 +1 @@
-LABEL x2go-tce-486
-        MENU LABEL  ^X2Go Thin Client (i486)
-        KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash
+../../_common_/debian-edu/x2go-tce.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0 b/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0
index ccfcec2..8ddd87d 120000
--- a/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0
+++ b/examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.0
@@ -1 +1 @@
-../_common_/pxelinux.0
\ No newline at end of file
+../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux b/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux
new file mode 120000
index 0000000..1e76da6
--- /dev/null
+++ b/examples/disklserver/tftp/diskless+localdisk+x2go/syslinux
@@ -0,0 +1 @@
+../_common_/syslinux/jessie/syslinux
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg
index 74cd3ec..0d9d6bf 100644
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg
+++ b/examples/disklserver/tftp/diskless+x2go/debian-edu/default-menu.cfg
@@ -1,7 +1,7 @@
-include debian-edu/ltsp-diskless.cfg
-MENU SEPARATOR
-include debian-edu/x2go-tce.cfg
+include debian-edu/ltsp-diskless-jessie.cfg
 MENU SEPARATOR
+#include debian-edu/x2go-tce.cfg
+#MENU SEPARATOR
 include debian-edu/memtest.cfg
 
 menu hshift 13
@@ -9,6 +9,7 @@ menu width 72
 menu background debian-edu/debian-edu-splash.png
 menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
 menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default debian-edu/vesamenu.c32
+default syslinux/vesamenu.c32
 prompt 0
-timeout 30
+timeout 100
+ontimeout ltsp-diskless-jessie
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg
new file mode 120000
index 0000000..209d4f9
--- /dev/null
+++ b/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless-jessie.cfg
@@ -0,0 +1 @@
+../../_common_/debian-edu/ltsp-diskless-jessie.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless.cfg
deleted file mode 100644
index b8796d7..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/ltsp-diskless.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-LABEL ltsp-diskless
-        MENU LABEL  ^Diskless Workstation
-        MENU DEFAULT
-        KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=/opt/ltsp/i386 boot=nfs ro quiet 2 ipappend splash
-
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg
index 7da6b48..a258c1d 100644..120000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg
+++ b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest.cfg
@@ -1,7 +1 @@
-LABEL memtest86+
-        MENU    LABEL  Speichertest (memtest86+)
-        kernel  debian-edu/memtest86+.bin
-LABEL memtest86
-        MENU    LABEL  Speichertest (memtest86)
-        kernel  debian-edu/memtest86.bin
-
+../../_common_/debian-edu/memtest.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin
index 7cc1baf..1b74cce 120000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin
+++ b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86+.bin
@@ -1 +1 @@
-../../_common_/ltsp/i386/memtest86+.bin
\ No newline at end of file
+/boot/memtest86+.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin
index a49566a..2596a63 120000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin
+++ b/examples/disklserver/tftp/diskless+x2go/debian-edu/memtest86.bin
@@ -1 +1 @@
-../../_common_/ltsp/i386/memtest86.bin
\ No newline at end of file
+/boot/memtest86.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/vesamenu.c32 b/examples/disklserver/tftp/diskless+x2go/debian-edu/vesamenu.c32
deleted file mode 120000
index d06c444..0000000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/vesamenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg
index a5304d7..6f7e32a 100644..120000
--- a/examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg
+++ b/examples/disklserver/tftp/diskless+x2go/debian-edu/x2go-tce.cfg
@@ -1,4 +1 @@
-LABEL x2go-tce-486
-        MENU LABEL  ^X2Go Thin Client (i486)
-        KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash
+../../_common_/debian-edu/x2go-tce.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/pxelinux.0 b/examples/disklserver/tftp/diskless+x2go/pxelinux.0
index ccfcec2..8ddd87d 120000
--- a/examples/disklserver/tftp/diskless+x2go/pxelinux.0
+++ b/examples/disklserver/tftp/diskless+x2go/pxelinux.0
@@ -1 +1 @@
-../_common_/pxelinux.0
\ No newline at end of file
+../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file
diff --git a/examples/disklserver/tftp/diskless+x2go/syslinux b/examples/disklserver/tftp/diskless+x2go/syslinux
new file mode 120000
index 0000000..1e76da6
--- /dev/null
+++ b/examples/disklserver/tftp/diskless+x2go/syslinux
@@ -0,0 +1 @@
+../_common_/syslinux/jessie/syslinux
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png b/examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png
new file mode 120000
index 0000000..028aa3a
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/debian-edu/debian-edu-splash.png
@@ -0,0 +1 @@
+/usr/share/pixmaps/splash/debian-edu-splash.png
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg
new file mode 100644
index 0000000..97b819a
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/debian-edu/default-menu.cfg
@@ -0,0 +1,15 @@
+include debian-edu/mint-workstation.cfg
+MENU SEPARATOR
+#include debian-edu/x2go-tce.cfg
+#MENU SEPARATOR
+include debian-edu/memtest.cfg
+
+menu hshift 13
+menu width 72
+menu background debian-edu/debian-edu-splash.png
+menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
+menu autoboot Automatischer Systemstart in # Sekunde{,n}
+default syslinux/vesamenu.c32
+prompt 0
+timeout 100
+ontimeout mint-workstation
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg
new file mode 120000
index 0000000..a258c1d
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest.cfg
@@ -0,0 +1 @@
+../../_common_/debian-edu/memtest.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin
new file mode 120000
index 0000000..1b74cce
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86+.bin
@@ -0,0 +1 @@
+/boot/memtest86+.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin
new file mode 120000
index 0000000..2596a63
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/debian-edu/memtest86.bin
@@ -0,0 +1 @@
+/boot/memtest86.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg
new file mode 120000
index 0000000..aefcc8b
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/debian-edu/mint-workstation.cfg
@@ -0,0 +1 @@
+../../_common_/debian-edu/mint-workstation.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg
new file mode 120000
index 0000000..6f7e32a
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/debian-edu/x2go-tce.cfg
@@ -0,0 +1 @@
+../../_common_/debian-edu/x2go-tce.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/ltsp b/examples/disklserver/tftp/mint+x2go/ltsp
new file mode 120000
index 0000000..7733dbc
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/ltsp
@@ -0,0 +1 @@
+../_common_/ltsp
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/pxelinux.0 b/examples/disklserver/tftp/mint+x2go/pxelinux.0
new file mode 120000
index 0000000..8ddd87d
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/pxelinux.0
@@ -0,0 +1 @@
+../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default b/examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default
new file mode 120000
index 0000000..ec0c12a
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/pxelinux.cfg/default
@@ -0,0 +1 @@
+../debian-edu/default-menu.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/mint+x2go/syslinux b/examples/disklserver/tftp/mint+x2go/syslinux
new file mode 120000
index 0000000..1e76da6
--- /dev/null
+++ b/examples/disklserver/tftp/mint+x2go/syslinux
@@ -0,0 +1 @@
+../_common_/syslinux/jessie/syslinux
\ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg
index 88e4888..4f887d3 100644
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg
+++ b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/default-menu.cfg
@@ -1,7 +1,7 @@
 include debian-edu/skolelinux-workstation.cfg
 MENU SEPARATOR
-include debian-edu/x2go-tce.cfg
-MENU SEPARATOR
+#include debian-edu/x2go-tce.cfg
+#MENU SEPARATOR
 include debian-edu/memtest.cfg
 
 menu hshift 13
@@ -9,6 +9,7 @@ menu width 72
 menu background debian-edu/debian-edu-splash.png
 menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
 menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default debian-edu/vesamenu.c32
+default syslinux/vesamenu.c32
 prompt 0
 timeout 100
+ontimeout skolelinux-workstation
\ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg
index 7da6b48..a258c1d 100644..120000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg
+++ b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg
@@ -1,7 +1 @@
-LABEL memtest86+
-        MENU    LABEL  Speichertest (memtest86+)
-        kernel  debian-edu/memtest86+.bin
-LABEL memtest86
-        MENU    LABEL  Speichertest (memtest86)
-        kernel  debian-edu/memtest86.bin
-
+../../_common_/debian-edu/memtest.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin
index 7cc1baf..1b74cce 120000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin
+++ b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86+.bin
@@ -1 +1 @@
-../../_common_/ltsp/i386/memtest86+.bin
\ No newline at end of file
+/boot/memtest86+.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin
index a49566a..2596a63 120000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin
+++ b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin
@@ -1 +1 @@
-../../_common_/ltsp/i386/memtest86.bin
\ No newline at end of file
+/boot/memtest86.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg
index 9fcf982..e018427 100644..120000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg
+++ b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg
@@ -1,10 +1 @@
-# English
-#LABEL localboot
-#        MENU LABEL Debian Edu/Skolelinux Workstation
-#        localboot 0
-#
-
-# German
-LABEL localboot
-       MENU LABEL Debian Edu/Skolelinux Arbeitsstation
-       localboot 0
+../../_common_/debian-edu/skolelinux-workstation.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/vesamenu.c32 b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/vesamenu.c32
deleted file mode 120000
index d06c444..0000000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/vesamenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg
index a5304d7..6f7e32a 100644..120000
--- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg
+++ b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg
@@ -1,4 +1 @@
-LABEL x2go-tce-486
-        MENU LABEL  ^X2Go Thin Client (i486)
-        KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash
+../../_common_/debian-edu/x2go-tce.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0 b/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0
index ccfcec2..8ddd87d 120000
--- a/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0
+++ b/examples/disklserver/tftp/skolelinux+x2go/pxelinux.0
@@ -1 +1 @@
-../_common_/pxelinux.0
\ No newline at end of file
+../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file
diff --git a/examples/disklserver/tftp/skolelinux+x2go/syslinux b/examples/disklserver/tftp/skolelinux+x2go/syslinux
new file mode 120000
index 0000000..1e76da6
--- /dev/null
+++ b/examples/disklserver/tftp/skolelinux+x2go/syslinux
@@ -0,0 +1 @@
+../_common_/syslinux/jessie/syslinux
\ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg
index bfca7d7..a88e510 100644
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg
+++ b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/default-menu.cfg
@@ -1,14 +1,15 @@
 include debian-edu/ubuntu-workstation.cfg
 MENU SEPARATOR
-include debian-edu/x2go-tce.cfg
-MENU SEPARATOR
+#include debian-edu/x2go-tce.cfg
+#MENU SEPARATOR
 include debian-edu/memtest.cfg
 
 menu hshift 13
 menu width 72
 menu background debian-edu/debian-edu-splash.png
-default debian-edu/vesamenu.c32
 menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
 menu autoboot Automatischer Systemstart in # Sekunde{,n}
+default syslinux/vesamenu.c32
 prompt 0
 timeout 100
+ontimeout ubuntu-workstation
\ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg
index 7da6b48..a258c1d 100644..120000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg
+++ b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest.cfg
@@ -1,7 +1 @@
-LABEL memtest86+
-        MENU    LABEL  Speichertest (memtest86+)
-        kernel  debian-edu/memtest86+.bin
-LABEL memtest86
-        MENU    LABEL  Speichertest (memtest86)
-        kernel  debian-edu/memtest86.bin
-
+../../_common_/debian-edu/memtest.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin
index 7cc1baf..1b74cce 120000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin
+++ b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86+.bin
@@ -1 +1 @@
-../../_common_/ltsp/i386/memtest86+.bin
\ No newline at end of file
+/boot/memtest86+.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin
index a49566a..2596a63 120000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin
+++ b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/memtest86.bin
@@ -1 +1 @@
-../../_common_/ltsp/i386/memtest86.bin
\ No newline at end of file
+/boot/memtest86.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg
index 323248c..993f00a 100644..120000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg
+++ b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/ubuntu-workstation.cfg
@@ -1,10 +1 @@
-# English
-#LABEL localboot
-#        MENU LABEL Boot from ^local harddrive
-#        localboot 0
-#
-
-# German
-LABEL localboot
-       MENU LABEL Ubuntu GNU/Linux
-       localboot 0
+../../_common_/debian-edu/ubuntu-workstation.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/vesamenu.c32 b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/vesamenu.c32
deleted file mode 120000
index d06c444..0000000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/vesamenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg
index a5304d7..6f7e32a 100644..120000
--- a/examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg
+++ b/examples/disklserver/tftp/ubuntu+x2go/debian-edu/x2go-tce.cfg
@@ -1,4 +1 @@
-LABEL x2go-tce-486
-        MENU LABEL  ^X2Go Thin Client (i486)
-        KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash
+../../_common_/debian-edu/x2go-tce.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0 b/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0
index ccfcec2..8ddd87d 120000
--- a/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0
+++ b/examples/disklserver/tftp/ubuntu+x2go/pxelinux.0
@@ -1 +1 @@
-../_common_/pxelinux.0
\ No newline at end of file
+../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file
diff --git a/examples/disklserver/tftp/ubuntu+x2go/syslinux b/examples/disklserver/tftp/ubuntu+x2go/syslinux
new file mode 120000
index 0000000..1e76da6
--- /dev/null
+++ b/examples/disklserver/tftp/ubuntu+x2go/syslinux
@@ -0,0 +1 @@
+../_common_/syslinux/jessie/syslinux
\ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg
index 9e199a7..30f1cef 100644
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg
+++ b/examples/disklserver/tftp/windows+x2go/debian-edu/default-menu.cfg
@@ -1,7 +1,7 @@
-include debian-edu/localboot.cfg
-MENU SEPARATOR
-include debian-edu/x2go-tce.cfg
+include debian-edu/localboot-mswin.cfg
 MENU SEPARATOR
+#include debian-edu/x2go-tce.cfg
+#MENU SEPARATOR
 include debian-edu/memtest.cfg
 
 menu hshift 13
@@ -9,6 +9,7 @@ menu width 72
 menu background debian-edu/debian-edu-splash.png
 menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
 menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default debian-edu/vesamenu.c32
+default syslinux/vesamenu.c32
 prompt 0
 timeout 100
+ontimeout localboot-mswin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg
new file mode 120000
index 0000000..ad6b28d
--- /dev/null
+++ b/examples/disklserver/tftp/windows+x2go/debian-edu/localboot-mswin.cfg
@@ -0,0 +1 @@
+../../_common_/debian-edu/localboot-mswin.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg
index 7da6b48..a258c1d 100644..120000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg
+++ b/examples/disklserver/tftp/windows+x2go/debian-edu/memtest.cfg
@@ -1,7 +1 @@
-LABEL memtest86+
-        MENU    LABEL  Speichertest (memtest86+)
-        kernel  debian-edu/memtest86+.bin
-LABEL memtest86
-        MENU    LABEL  Speichertest (memtest86)
-        kernel  debian-edu/memtest86.bin
-
+../../_common_/debian-edu/memtest.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin b/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin
index 7cc1baf..1b74cce 120000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin
+++ b/examples/disklserver/tftp/windows+x2go/debian-edu/memtest86+.bin
@@ -1 +1 @@
-../../_common_/ltsp/i386/memtest86+.bin
\ No newline at end of file
+/boot/memtest86+.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/vesamenu.c32 b/examples/disklserver/tftp/windows+x2go/debian-edu/vesamenu.c32
deleted file mode 120000
index d06c444..0000000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/vesamenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg
index a5304d7..6f7e32a 100644..120000
--- a/examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg
+++ b/examples/disklserver/tftp/windows+x2go/debian-edu/x2go-tce.cfg
@@ -1,4 +1 @@
-LABEL x2go-tce-486
-        MENU LABEL  ^X2Go Thin Client (i486)
-        KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash
+../../_common_/debian-edu/x2go-tce.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/pxelinux.0 b/examples/disklserver/tftp/windows+x2go/pxelinux.0
index ccfcec2..8ddd87d 120000
--- a/examples/disklserver/tftp/windows+x2go/pxelinux.0
+++ b/examples/disklserver/tftp/windows+x2go/pxelinux.0
@@ -1 +1 @@
-../_common_/pxelinux.0
\ No newline at end of file
+../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file
diff --git a/examples/disklserver/tftp/windows+x2go/syslinux b/examples/disklserver/tftp/windows+x2go/syslinux
new file mode 120000
index 0000000..1e76da6
--- /dev/null
+++ b/examples/disklserver/tftp/windows+x2go/syslinux
@@ -0,0 +1 @@
+../_common_/syslinux/jessie/syslinux
\ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg b/examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg
index 2347601..4013474 100644
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg
+++ b/examples/disklserver/tftp/x2go-tce/debian-edu/default-menu.cfg
@@ -7,6 +7,7 @@ menu width 72
 menu background debian-edu/debian-edu-splash.png
 menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren
 menu autoboot Automatischer Systemstart in # Sekunde{,n}
-default debian-edu/vesamenu.c32
+default syslinux/vesamenu.c32
 prompt 0
-timeout 100
+timeout 30
+ontimeout x2go-tce
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg b/examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg
index 7da6b48..a258c1d 100644..120000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg
+++ b/examples/disklserver/tftp/x2go-tce/debian-edu/memtest.cfg
@@ -1,7 +1 @@
-LABEL memtest86+
-        MENU    LABEL  Speichertest (memtest86+)
-        kernel  debian-edu/memtest86+.bin
-LABEL memtest86
-        MENU    LABEL  Speichertest (memtest86)
-        kernel  debian-edu/memtest86.bin
-
+../../_common_/debian-edu/memtest.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin b/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin
index 7cc1baf..1b74cce 120000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin
+++ b/examples/disklserver/tftp/x2go-tce/debian-edu/memtest86+.bin
@@ -1 +1 @@
-../../_common_/ltsp/i386/memtest86+.bin
\ No newline at end of file
+/boot/memtest86+.bin
\ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/vesamenu.c32 b/examples/disklserver/tftp/x2go-tce/debian-edu/vesamenu.c32
deleted file mode 120000
index d06c444..0000000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/vesamenu.c32
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/syslinux/vesamenu.c32
\ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg
index 0ab66f8..6f7e32a 100644..120000
--- a/examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg
+++ b/examples/disklserver/tftp/x2go-tce/debian-edu/x2go-tce.cfg
@@ -1,5 +1 @@
-LABEL x2go-tce-486
-        MENU LABEL  ^X2Go Thin Client (i486)
-        MENU DEFAULT
-        KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash
+../../_common_/debian-edu/x2go-tce.cfg
\ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/pxelinux.0 b/examples/disklserver/tftp/x2go-tce/pxelinux.0
index ccfcec2..8ddd87d 120000
--- a/examples/disklserver/tftp/x2go-tce/pxelinux.0
+++ b/examples/disklserver/tftp/x2go-tce/pxelinux.0
@@ -1 +1 @@
-../_common_/pxelinux.0
\ No newline at end of file
+../_common_/pxelinux/jessie/pxelinux.0
\ No newline at end of file
diff --git a/examples/disklserver/tftp/x2go-tce/syslinux b/examples/disklserver/tftp/x2go-tce/syslinux
new file mode 120000
index 0000000..1e76da6
--- /dev/null
+++ b/examples/disklserver/tftp/x2go-tce/syslinux
@@ -0,0 +1 @@
+../_common_/syslinux/jessie/syslinux
\ No newline at end of file