From b617dbdc6b56f0c08bcb8f6816395f641784147a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 25 Jul 2015 18:01:03 +0200 Subject: examples/disklserver/tftp: Adapt tftp configuration example (disklserver) to Debian Edu jessie. --- .../tftp/skolelinux+x2go/debian-edu/default-menu.cfg | 7 ++++--- .../disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg | 8 +------- .../tftp/skolelinux+x2go/debian-edu/memtest86+.bin | 2 +- .../disklserver/tftp/skolelinux+x2go/debian-edu/memtest86.bin | 2 +- .../skolelinux+x2go/debian-edu/skolelinux-workstation.cfg | 11 +---------- .../disklserver/tftp/skolelinux+x2go/debian-edu/vesamenu.c32 | 1 - .../disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg | 5 +---- 7 files changed, 9 insertions(+), 27 deletions(-) mode change 100644 => 120000 examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg mode change 100644 => 120000 examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg delete mode 120000 examples/disklserver/tftp/skolelinux+x2go/debian-edu/vesamenu.c32 mode change 100644 => 120000 examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg (limited to 'examples/disklserver/tftp/skolelinux+x2go/debian-edu') 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 deleted file mode 100644 index 7da6b48..0000000 --- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg +++ /dev/null @@ -1,7 +0,0 @@ -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/skolelinux+x2go/debian-edu/memtest.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/memtest.cfg new file mode 120000 index 0000000..a258c1d --- /dev/null +++ b/examples/disklserver/tftp/skolelinux+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/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 deleted file mode 100644 index 9fcf982..0000000 --- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# English -#LABEL localboot -# MENU LABEL Debian Edu/Skolelinux Workstation -# localboot 0 -# - -# German -LABEL localboot - MENU LABEL Debian Edu/Skolelinux Arbeitsstation - localboot 0 diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg new file mode 120000 index 0000000..e018427 --- /dev/null +++ b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/skolelinux-workstation.cfg @@ -0,0 +1 @@ +../../_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 deleted file mode 100644 index a5304d7..0000000 --- a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg +++ /dev/null @@ -1,4 +0,0 @@ -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 diff --git a/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg new file mode 120000 index 0000000..6f7e32a --- /dev/null +++ b/examples/disklserver/tftp/skolelinux+x2go/debian-edu/x2go-tce.cfg @@ -0,0 +1 @@ +../../_common_/debian-edu/x2go-tce.cfg \ No newline at end of file -- cgit v1.2.3