summaryrefslogtreecommitdiff
path: root/examples/disklserver/tftp/diskless+localdisk+x2go
diff options
context:
space:
mode:
Diffstat (limited to 'examples/disklserver/tftp/diskless+localdisk+x2go')
-rw-r--r--examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/default-menu.cfg10
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot-generic.cfg1
-rw-r--r--examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/localboot.cfg10
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless-jessie.cfg1
-rw-r--r--examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/ltsp-diskless.cfg7
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86+.bin2
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/memtest86.bin2
l---------examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/vesamenu.c321
l---------[-rw-r--r--]examples/disklserver/tftp/diskless+localdisk+x2go/debian-edu/x2go-tce.cfg5
l---------examples/disklserver/tftp/diskless+localdisk+x2go/pxelinux.02
l---------examples/disklserver/tftp/diskless+localdisk+x2go/syslinux1
11 files changed, 12 insertions, 30 deletions
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