From 02bb53d21a5bea886b3583da4b4a59b0d2622366 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 25 Jul 2015 18:22:29 +0200 Subject: examples/mainserver/tftp: Adapt tftp configuration example (mainserver) to Debian Edu jessie. --- .../mainserver/tftp/debian-edu/default-menu.cfg | 8 +++----- examples/mainserver/tftp/debian-edu/install.cfg | 21 ++++++++++----------- examples/mainserver/tftp/debian-edu/localboot.cfg | 2 +- examples/mainserver/tftp/debian-edu/vesamenu.c32 | 1 - examples/mainserver/tftp/debian-installer/amd64 | 1 - .../mainserver/tftp/debian-installer/amd64.jessie | 1 + examples/mainserver/tftp/debian-installer/i386 | 1 - .../mainserver/tftp/debian-installer/i386.jessie | 1 + examples/mainserver/tftp/pxelinux.0 | 2 +- examples/mainserver/tftp/syslinux | 1 + 10 files changed, 18 insertions(+), 21 deletions(-) delete mode 120000 examples/mainserver/tftp/debian-edu/vesamenu.c32 delete mode 120000 examples/mainserver/tftp/debian-installer/amd64 create mode 120000 examples/mainserver/tftp/debian-installer/amd64.jessie delete mode 120000 examples/mainserver/tftp/debian-installer/i386 create mode 120000 examples/mainserver/tftp/debian-installer/i386.jessie create mode 120000 examples/mainserver/tftp/syslinux (limited to 'examples/mainserver/tftp') diff --git a/examples/mainserver/tftp/debian-edu/default-menu.cfg b/examples/mainserver/tftp/debian-edu/default-menu.cfg index 35c25e9..2a3f22d 100644 --- a/examples/mainserver/tftp/debian-edu/default-menu.cfg +++ b/examples/mainserver/tftp/debian-edu/default-menu.cfg @@ -1,8 +1,5 @@ include debian-edu/localboot.cfg MENU SEPARATOR -include debian-edu/ltsp-diskless.cfg -include debian-edu/ltsp-thin.cfg -MENU SEPARATOR include debian-edu/install.cfg MENU SEPARATOR include debian-edu/memtest.cfg @@ -11,6 +8,7 @@ menu hshift 13 menu width 72 menu background debian-edu/debian-edu-splash.png menu tabmsg ENTER: System starten; TAB: Menueeintraege editieren -default debian-edu/vesamenu.c32 +default syslinux/vesamenu.c32 prompt 0 -timeout 0 +timeout 100 +ontimeout localboot \ No newline at end of file diff --git a/examples/mainserver/tftp/debian-edu/install.cfg b/examples/mainserver/tftp/debian-edu/install.cfg index 508eb2c..6308f3e 100644 --- a/examples/mainserver/tftp/debian-edu/install.cfg +++ b/examples/mainserver/tftp/debian-edu/install.cfg @@ -1,14 +1,13 @@ - # Based on the values used in Debian, and added the preseed URL -LABEL neteduboot-i386 - MENU LABEL Installiere Debian Edu/Skolelinux (GNOME/^i386) - kernel debian-installer/i386/linux - append initrd=debian-installer/i386/initrd.gz -- quiet url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern debian-installer/locale=de_DE.UTF-8 console-keymaps-at/keymap=de-latin1-nodeadkeys desktop=gnome -include menupassword.cfg - - # Based on the values used in Debian, and added the preseed URL LABEL neteduboot-amd64 - MENU LABEL Installiere Debian Edu/Skolelinux (GNOME/^amd64) - kernel debian-installer/amd64/linux - append initrd=debian-installer/amd64/initrd.gz -- quiet url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern debian-installer/locale=de_DE.UTF-8 console-keymaps-at/keymap=de-latin1-nodeadkeys desktop=gnome + MENU LABEL Installiere Debian Edu/Skolelinux (MATE/^amd64) + kernel debian-installer/amd64.jessie/linux + append initrd=debian-installer/amd64.jessie/initrd.gz auto url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern locale=de_DE.UTF-8 keymap=de desktop=mate --- quiet + ipappend 2 include menupassword.cfg +LABEL neteduboot-i386 + MENU LABEL Installiere Debian Edu/Skolelinux (MATE/^i386) + kernel debian-installer/i386.jessie/linux + append initrd=debian-installer/i386.jessie/initrd.gz auto url=http://www/debian-edu-install.dat hostname=pxeinstall domain=intern locale=de_DE.UTF-8 keymap=de desktop=mate --- quiet + ipappend 2 +include menupassword.cfg diff --git a/examples/mainserver/tftp/debian-edu/localboot.cfg b/examples/mainserver/tftp/debian-edu/localboot.cfg index 82ebfa7..bf74f87 100644 --- a/examples/mainserver/tftp/debian-edu/localboot.cfg +++ b/examples/mainserver/tftp/debian-edu/localboot.cfg @@ -1,5 +1,5 @@ LABEL localboot - MENU LABEL Von ^lokaler Festplatte starten + MENU LABEL Von ^Festplatte starten MENU DEFAULT localboot 0 diff --git a/examples/mainserver/tftp/debian-edu/vesamenu.c32 b/examples/mainserver/tftp/debian-edu/vesamenu.c32 deleted file mode 120000 index d06c444..0000000 --- a/examples/mainserver/tftp/debian-edu/vesamenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/vesamenu.c32 \ No newline at end of file diff --git a/examples/mainserver/tftp/debian-installer/amd64 b/examples/mainserver/tftp/debian-installer/amd64 deleted file mode 120000 index 35c297c..0000000 --- a/examples/mainserver/tftp/debian-installer/amd64 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/debian-installer/images/amd64/text \ No newline at end of file diff --git a/examples/mainserver/tftp/debian-installer/amd64.jessie b/examples/mainserver/tftp/debian-installer/amd64.jessie new file mode 120000 index 0000000..a813f37 --- /dev/null +++ b/examples/mainserver/tftp/debian-installer/amd64.jessie @@ -0,0 +1 @@ +/usr/lib/debian-installer/images/8/amd64/text/debian-installer/amd64 \ No newline at end of file diff --git a/examples/mainserver/tftp/debian-installer/i386 b/examples/mainserver/tftp/debian-installer/i386 deleted file mode 120000 index 20f8d48..0000000 --- a/examples/mainserver/tftp/debian-installer/i386 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/debian-installer/images/i386/text \ No newline at end of file diff --git a/examples/mainserver/tftp/debian-installer/i386.jessie b/examples/mainserver/tftp/debian-installer/i386.jessie new file mode 120000 index 0000000..29fa845 --- /dev/null +++ b/examples/mainserver/tftp/debian-installer/i386.jessie @@ -0,0 +1 @@ +/usr/lib/debian-installer/images/8/i386/text/debian-installer/i386 \ No newline at end of file diff --git a/examples/mainserver/tftp/pxelinux.0 b/examples/mainserver/tftp/pxelinux.0 index 0f93aef..f723d02 120000 --- a/examples/mainserver/tftp/pxelinux.0 +++ b/examples/mainserver/tftp/pxelinux.0 @@ -1 +1 @@ -/usr/lib/syslinux/pxelinux.0 \ No newline at end of file +/usr/lib/PXELINUX/pxelinux.0 \ No newline at end of file diff --git a/examples/mainserver/tftp/syslinux b/examples/mainserver/tftp/syslinux new file mode 120000 index 0000000..7bea767 --- /dev/null +++ b/examples/mainserver/tftp/syslinux @@ -0,0 +1 @@ +/usr/lib/syslinux/modules/bios \ No newline at end of file -- cgit v1.2.3