From 055f0e8291e3aa9404a3e7a23d56cadc170665d9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 4 Aug 2012 12:38:23 +0200 Subject: D-I PXE Environment: Provide the /srv/tftp directory as ,,examples'', installing to /srv directly is a heavy violation of the Debian Policy, so we avoid that. --- debian/changelog | 8 +++++ debian/itzks-packages-mainserver.install | 1 - debian/itzks-packages-mainserver.lintian-overrides | 34 +++++++++++----------- examples/mainserver/tftp/README.tftp | 17 +++++++++++ .../tftp/debian-edu/debian-edu-splash.png | 1 + .../mainserver/tftp/debian-edu/default-menu.cfg | 16 ++++++++++ examples/mainserver/tftp/debian-edu/install.cfg | 14 +++++++++ examples/mainserver/tftp/debian-edu/localboot.cfg | 5 ++++ examples/mainserver/tftp/debian-edu/memtest.cfg | 8 +++++ examples/mainserver/tftp/debian-edu/memtest86+.bin | 1 + examples/mainserver/tftp/debian-edu/memtest86.bin | 1 + examples/mainserver/tftp/debian-edu/vesamenu.c32 | 1 + examples/mainserver/tftp/debian-installer/amd64 | 1 + examples/mainserver/tftp/debian-installer/i386 | 1 + examples/mainserver/tftp/pxelinux.0 | 1 + examples/mainserver/tftp/pxelinux.cfg/default | 1 + srv/tftp/debian-edu/debian-edu-splash.png | 1 - srv/tftp/debian-edu/default-menu.cfg | 16 ---------- srv/tftp/debian-edu/install.cfg | 14 --------- srv/tftp/debian-edu/localboot.cfg | 5 ---- srv/tftp/debian-edu/memtest.cfg | 8 ----- srv/tftp/debian-edu/memtest86+.bin | 1 - srv/tftp/debian-edu/memtest86.bin | 1 - srv/tftp/debian-edu/vesamenu.c32 | 1 - srv/tftp/debian-installer/amd64 | 1 - srv/tftp/debian-installer/i386 | 1 - srv/tftp/pxelinux.0 | 1 - srv/tftp/pxelinux.cfg/default | 1 - 28 files changed, 93 insertions(+), 69 deletions(-) create mode 100644 examples/mainserver/tftp/README.tftp create mode 120000 examples/mainserver/tftp/debian-edu/debian-edu-splash.png create mode 100644 examples/mainserver/tftp/debian-edu/default-menu.cfg create mode 100644 examples/mainserver/tftp/debian-edu/install.cfg create mode 100644 examples/mainserver/tftp/debian-edu/localboot.cfg create mode 100644 examples/mainserver/tftp/debian-edu/memtest.cfg create mode 120000 examples/mainserver/tftp/debian-edu/memtest86+.bin create mode 120000 examples/mainserver/tftp/debian-edu/memtest86.bin create mode 120000 examples/mainserver/tftp/debian-edu/vesamenu.c32 create mode 120000 examples/mainserver/tftp/debian-installer/amd64 create mode 120000 examples/mainserver/tftp/debian-installer/i386 create mode 120000 examples/mainserver/tftp/pxelinux.0 create mode 120000 examples/mainserver/tftp/pxelinux.cfg/default delete mode 120000 srv/tftp/debian-edu/debian-edu-splash.png delete mode 100644 srv/tftp/debian-edu/default-menu.cfg delete mode 100644 srv/tftp/debian-edu/install.cfg delete mode 100644 srv/tftp/debian-edu/localboot.cfg delete mode 100644 srv/tftp/debian-edu/memtest.cfg delete mode 120000 srv/tftp/debian-edu/memtest86+.bin delete mode 120000 srv/tftp/debian-edu/memtest86.bin delete mode 120000 srv/tftp/debian-edu/vesamenu.c32 delete mode 120000 srv/tftp/debian-installer/amd64 delete mode 120000 srv/tftp/debian-installer/i386 delete mode 120000 srv/tftp/pxelinux.0 delete mode 120000 srv/tftp/pxelinux.cfg/default diff --git a/debian/changelog b/debian/changelog index 47e2b52..8f5e466 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +itzks-packages (2012.08.04.5) UNRELEASED; urgency=low + + * D-I PXE Environment: + + Provide the /srv/tftp directory as ,,examples'', installing to /srv + directly is a heavy violation of the Debian Policy, so we avoid that. + + -- Mike Gabriel Sat, 04 Aug 2012 12:37:10 +0200 + itzks-packages (2012.08.04.4) squeeze-backports; urgency=low * Fix last package version, complete mis-installation of PXE D-I env files. diff --git a/debian/itzks-packages-mainserver.install b/debian/itzks-packages-mainserver.install index 6e1675d..4b9a209 100644 --- a/debian/itzks-packages-mainserver.install +++ b/debian/itzks-packages-mainserver.install @@ -1,2 +1 @@ etc/skel etc/ -srv/tftp srv/ \ No newline at end of file diff --git a/debian/itzks-packages-mainserver.lintian-overrides b/debian/itzks-packages-mainserver.lintian-overrides index e49cdd4..b58bd0b 100644 --- a/debian/itzks-packages-mainserver.lintian-overrides +++ b/debian/itzks-packages-mainserver.lintian-overrides @@ -4,20 +4,20 @@ itzks-packages-mainserver: unusual-interpreter etc/skel/Desktop/libreoffice-calc itzks-packages-mainserver: unusual-interpreter etc/skel/Desktop/libreoffice-impress.desktop #!xdg-open itzks-packages-mainserver: unusual-interpreter etc/skel/Desktop/libreoffice-writer.desktop #!xdg-open -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/ -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/ -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/ -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/debian-edu-splash.png -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/default-menu.cfg -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/install.cfg -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/localboot.cfg -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/memtest.cfg -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/memtest86+.bin -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/memtest86.bin -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/vesamenu.c32 -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-installer/ -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-installer/amd64 -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/debian-installer/i386 -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/pxelinux.0 -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/pxelinux.cfg/ -itzks-packages-disklserver: dir-or-file-in-srv srv/tftp/tftp/pxelinux.cfg/default \ No newline at end of file +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/ +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/ +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/ +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/debian-edu-splash.png +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/default-menu.cfg +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/install.cfg +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/localboot.cfg +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/memtest.cfg +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/memtest86+.bin +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/memtest86.bin +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-edu/vesamenu.c32 +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-installer/ +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-installer/amd64 +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/debian-installer/i386 +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/pxelinux.0 +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/pxelinux.cfg/ +itzks-packages-mainserver: dir-or-file-in-srv srv/tftp/tftp/pxelinux.cfg/default \ No newline at end of file diff --git a/examples/mainserver/tftp/README.tftp b/examples/mainserver/tftp/README.tftp new file mode 100644 index 0000000..ade26cd --- /dev/null +++ b/examples/mainserver/tftp/README.tftp @@ -0,0 +1,17 @@ +This folder contains a PXE Bootenvironment that provides the +Debian Edu installer (in German) on the Debian Edu main server. + +Installation steps: + + 1. Copy these files to tjener:/srv/tftp + + $ cp -a /usr/share/doc/itzks-packages-mainserver/examples/tftp /srv + + 2. Preserve /var/lib/tftpboot + + $ mv /var/lib/tftpboot /var/lib/tftpboot.orig + + 3. Symlink /var/lib/tftpboot -> /srv/tftp + + $ ln -s /srv/tftp /var/lib/tftpboot + diff --git a/examples/mainserver/tftp/debian-edu/debian-edu-splash.png b/examples/mainserver/tftp/debian-edu/debian-edu-splash.png new file mode 120000 index 0000000..028aa3a --- /dev/null +++ b/examples/mainserver/tftp/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/mainserver/tftp/debian-edu/default-menu.cfg b/examples/mainserver/tftp/debian-edu/default-menu.cfg new file mode 100644 index 0000000..35c25e9 --- /dev/null +++ b/examples/mainserver/tftp/debian-edu/default-menu.cfg @@ -0,0 +1,16 @@ +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 + +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 +prompt 0 +timeout 0 diff --git a/examples/mainserver/tftp/debian-edu/install.cfg b/examples/mainserver/tftp/debian-edu/install.cfg new file mode 100644 index 0000000..508eb2c --- /dev/null +++ b/examples/mainserver/tftp/debian-edu/install.cfg @@ -0,0 +1,14 @@ + # 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 +include menupassword.cfg + diff --git a/examples/mainserver/tftp/debian-edu/localboot.cfg b/examples/mainserver/tftp/debian-edu/localboot.cfg new file mode 100644 index 0000000..82ebfa7 --- /dev/null +++ b/examples/mainserver/tftp/debian-edu/localboot.cfg @@ -0,0 +1,5 @@ +LABEL localboot + MENU LABEL Von ^lokaler Festplatte starten + MENU DEFAULT + localboot 0 + diff --git a/examples/mainserver/tftp/debian-edu/memtest.cfg b/examples/mainserver/tftp/debian-edu/memtest.cfg new file mode 100644 index 0000000..c8e0df2 --- /dev/null +++ b/examples/mainserver/tftp/debian-edu/memtest.cfg @@ -0,0 +1,8 @@ +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/mainserver/tftp/debian-edu/memtest86+.bin b/examples/mainserver/tftp/debian-edu/memtest86+.bin new file mode 120000 index 0000000..1b74cce --- /dev/null +++ b/examples/mainserver/tftp/debian-edu/memtest86+.bin @@ -0,0 +1 @@ +/boot/memtest86+.bin \ No newline at end of file diff --git a/examples/mainserver/tftp/debian-edu/memtest86.bin b/examples/mainserver/tftp/debian-edu/memtest86.bin new file mode 120000 index 0000000..2596a63 --- /dev/null +++ b/examples/mainserver/tftp/debian-edu/memtest86.bin @@ -0,0 +1 @@ +/boot/memtest86.bin \ No newline at end of file diff --git a/examples/mainserver/tftp/debian-edu/vesamenu.c32 b/examples/mainserver/tftp/debian-edu/vesamenu.c32 new file mode 120000 index 0000000..d06c444 --- /dev/null +++ b/examples/mainserver/tftp/debian-edu/vesamenu.c32 @@ -0,0 +1 @@ +/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 new file mode 120000 index 0000000..35c297c --- /dev/null +++ b/examples/mainserver/tftp/debian-installer/amd64 @@ -0,0 +1 @@ +/usr/lib/debian-installer/images/amd64/text \ No newline at end of file diff --git a/examples/mainserver/tftp/debian-installer/i386 b/examples/mainserver/tftp/debian-installer/i386 new file mode 120000 index 0000000..20f8d48 --- /dev/null +++ b/examples/mainserver/tftp/debian-installer/i386 @@ -0,0 +1 @@ +/usr/lib/debian-installer/images/i386/text \ No newline at end of file diff --git a/examples/mainserver/tftp/pxelinux.0 b/examples/mainserver/tftp/pxelinux.0 new file mode 120000 index 0000000..0f93aef --- /dev/null +++ b/examples/mainserver/tftp/pxelinux.0 @@ -0,0 +1 @@ +/usr/lib/syslinux/pxelinux.0 \ No newline at end of file diff --git a/examples/mainserver/tftp/pxelinux.cfg/default b/examples/mainserver/tftp/pxelinux.cfg/default new file mode 120000 index 0000000..ec0c12a --- /dev/null +++ b/examples/mainserver/tftp/pxelinux.cfg/default @@ -0,0 +1 @@ +../debian-edu/default-menu.cfg \ No newline at end of file diff --git a/srv/tftp/debian-edu/debian-edu-splash.png b/srv/tftp/debian-edu/debian-edu-splash.png deleted file mode 120000 index 028aa3a..0000000 --- a/srv/tftp/debian-edu/debian-edu-splash.png +++ /dev/null @@ -1 +0,0 @@ -/usr/share/pixmaps/splash/debian-edu-splash.png \ No newline at end of file diff --git a/srv/tftp/debian-edu/default-menu.cfg b/srv/tftp/debian-edu/default-menu.cfg deleted file mode 100644 index 35c25e9..0000000 --- a/srv/tftp/debian-edu/default-menu.cfg +++ /dev/null @@ -1,16 +0,0 @@ -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 - -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 -prompt 0 -timeout 0 diff --git a/srv/tftp/debian-edu/install.cfg b/srv/tftp/debian-edu/install.cfg deleted file mode 100644 index 508eb2c..0000000 --- a/srv/tftp/debian-edu/install.cfg +++ /dev/null @@ -1,14 +0,0 @@ - # 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 -include menupassword.cfg - diff --git a/srv/tftp/debian-edu/localboot.cfg b/srv/tftp/debian-edu/localboot.cfg deleted file mode 100644 index 82ebfa7..0000000 --- a/srv/tftp/debian-edu/localboot.cfg +++ /dev/null @@ -1,5 +0,0 @@ -LABEL localboot - MENU LABEL Von ^lokaler Festplatte starten - MENU DEFAULT - localboot 0 - diff --git a/srv/tftp/debian-edu/memtest.cfg b/srv/tftp/debian-edu/memtest.cfg deleted file mode 100644 index c8e0df2..0000000 --- a/srv/tftp/debian-edu/memtest.cfg +++ /dev/null @@ -1,8 +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/srv/tftp/debian-edu/memtest86+.bin b/srv/tftp/debian-edu/memtest86+.bin deleted file mode 120000 index 1b74cce..0000000 --- a/srv/tftp/debian-edu/memtest86+.bin +++ /dev/null @@ -1 +0,0 @@ -/boot/memtest86+.bin \ No newline at end of file diff --git a/srv/tftp/debian-edu/memtest86.bin b/srv/tftp/debian-edu/memtest86.bin deleted file mode 120000 index 2596a63..0000000 --- a/srv/tftp/debian-edu/memtest86.bin +++ /dev/null @@ -1 +0,0 @@ -/boot/memtest86.bin \ No newline at end of file diff --git a/srv/tftp/debian-edu/vesamenu.c32 b/srv/tftp/debian-edu/vesamenu.c32 deleted file mode 120000 index d06c444..0000000 --- a/srv/tftp/debian-edu/vesamenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/vesamenu.c32 \ No newline at end of file diff --git a/srv/tftp/debian-installer/amd64 b/srv/tftp/debian-installer/amd64 deleted file mode 120000 index 35c297c..0000000 --- a/srv/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/srv/tftp/debian-installer/i386 b/srv/tftp/debian-installer/i386 deleted file mode 120000 index 20f8d48..0000000 --- a/srv/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/srv/tftp/pxelinux.0 b/srv/tftp/pxelinux.0 deleted file mode 120000 index 0f93aef..0000000 --- a/srv/tftp/pxelinux.0 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/pxelinux.0 \ No newline at end of file diff --git a/srv/tftp/pxelinux.cfg/default b/srv/tftp/pxelinux.cfg/default deleted file mode 120000 index ec0c12a..0000000 --- a/srv/tftp/pxelinux.cfg/default +++ /dev/null @@ -1 +0,0 @@ -../debian-edu/default-menu.cfg \ No newline at end of file -- cgit v1.2.3