9 files changed, 11 insertions, 28 deletions
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