summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-08-04 12:38:23 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-08-04 12:38:23 +0200
commit055f0e8291e3aa9404a3e7a23d56cadc170665d9 (patch)
tree3dc8818194e439870153b4fad950734a1a067b6f
parent119b9754627ef46fa0d2c739ccfe3afb1a4d3e98 (diff)
downloaditzks-systems-055f0e8291e3aa9404a3e7a23d56cadc170665d9.tar.gz
itzks-systems-055f0e8291e3aa9404a3e7a23d56cadc170665d9.tar.bz2
itzks-systems-055f0e8291e3aa9404a3e7a23d56cadc170665d9.zip
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.
-rw-r--r--debian/changelog8
-rw-r--r--debian/itzks-packages-mainserver.install1
-rw-r--r--debian/itzks-packages-mainserver.lintian-overrides34
-rw-r--r--examples/mainserver/tftp/README.tftp17
l---------examples/mainserver/tftp/debian-edu/debian-edu-splash.png (renamed from srv/tftp/debian-edu/debian-edu-splash.png)0
-rw-r--r--examples/mainserver/tftp/debian-edu/default-menu.cfg (renamed from srv/tftp/debian-edu/default-menu.cfg)0
-rw-r--r--examples/mainserver/tftp/debian-edu/install.cfg (renamed from srv/tftp/debian-edu/install.cfg)0
-rw-r--r--examples/mainserver/tftp/debian-edu/localboot.cfg (renamed from srv/tftp/debian-edu/localboot.cfg)0
-rw-r--r--examples/mainserver/tftp/debian-edu/memtest.cfg (renamed from srv/tftp/debian-edu/memtest.cfg)0
l---------examples/mainserver/tftp/debian-edu/memtest86+.bin (renamed from srv/tftp/debian-edu/memtest86+.bin)0
l---------examples/mainserver/tftp/debian-edu/memtest86.bin (renamed from srv/tftp/debian-edu/memtest86.bin)0
l---------examples/mainserver/tftp/debian-edu/vesamenu.c32 (renamed from srv/tftp/debian-edu/vesamenu.c32)0
l---------examples/mainserver/tftp/debian-installer/amd64 (renamed from srv/tftp/debian-installer/amd64)0
l---------examples/mainserver/tftp/debian-installer/i386 (renamed from srv/tftp/debian-installer/i386)0
l---------examples/mainserver/tftp/pxelinux.0 (renamed from srv/tftp/pxelinux.0)0
l---------examples/mainserver/tftp/pxelinux.cfg/default (renamed from srv/tftp/pxelinux.cfg/default)0
16 files changed, 42 insertions, 18 deletions
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 <mike.gabriel@das-netzwerkteam.de> 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/srv/tftp/debian-edu/debian-edu-splash.png b/examples/mainserver/tftp/debian-edu/debian-edu-splash.png
index 028aa3a..028aa3a 120000
--- a/srv/tftp/debian-edu/debian-edu-splash.png
+++ b/examples/mainserver/tftp/debian-edu/debian-edu-splash.png
diff --git a/srv/tftp/debian-edu/default-menu.cfg b/examples/mainserver/tftp/debian-edu/default-menu.cfg
index 35c25e9..35c25e9 100644
--- a/srv/tftp/debian-edu/default-menu.cfg
+++ b/examples/mainserver/tftp/debian-edu/default-menu.cfg
diff --git a/srv/tftp/debian-edu/install.cfg b/examples/mainserver/tftp/debian-edu/install.cfg
index 508eb2c..508eb2c 100644
--- a/srv/tftp/debian-edu/install.cfg
+++ b/examples/mainserver/tftp/debian-edu/install.cfg
diff --git a/srv/tftp/debian-edu/localboot.cfg b/examples/mainserver/tftp/debian-edu/localboot.cfg
index 82ebfa7..82ebfa7 100644
--- a/srv/tftp/debian-edu/localboot.cfg
+++ b/examples/mainserver/tftp/debian-edu/localboot.cfg
diff --git a/srv/tftp/debian-edu/memtest.cfg b/examples/mainserver/tftp/debian-edu/memtest.cfg
index c8e0df2..c8e0df2 100644
--- a/srv/tftp/debian-edu/memtest.cfg
+++ b/examples/mainserver/tftp/debian-edu/memtest.cfg
diff --git a/srv/tftp/debian-edu/memtest86+.bin b/examples/mainserver/tftp/debian-edu/memtest86+.bin
index 1b74cce..1b74cce 120000
--- a/srv/tftp/debian-edu/memtest86+.bin
+++ b/examples/mainserver/tftp/debian-edu/memtest86+.bin
diff --git a/srv/tftp/debian-edu/memtest86.bin b/examples/mainserver/tftp/debian-edu/memtest86.bin
index 2596a63..2596a63 120000
--- a/srv/tftp/debian-edu/memtest86.bin
+++ b/examples/mainserver/tftp/debian-edu/memtest86.bin
diff --git a/srv/tftp/debian-edu/vesamenu.c32 b/examples/mainserver/tftp/debian-edu/vesamenu.c32
index d06c444..d06c444 120000
--- a/srv/tftp/debian-edu/vesamenu.c32
+++ b/examples/mainserver/tftp/debian-edu/vesamenu.c32
diff --git a/srv/tftp/debian-installer/amd64 b/examples/mainserver/tftp/debian-installer/amd64
index 35c297c..35c297c 120000
--- a/srv/tftp/debian-installer/amd64
+++ b/examples/mainserver/tftp/debian-installer/amd64
diff --git a/srv/tftp/debian-installer/i386 b/examples/mainserver/tftp/debian-installer/i386
index 20f8d48..20f8d48 120000
--- a/srv/tftp/debian-installer/i386
+++ b/examples/mainserver/tftp/debian-installer/i386
diff --git a/srv/tftp/pxelinux.0 b/examples/mainserver/tftp/pxelinux.0
index 0f93aef..0f93aef 120000
--- a/srv/tftp/pxelinux.0
+++ b/examples/mainserver/tftp/pxelinux.0
diff --git a/srv/tftp/pxelinux.cfg/default b/examples/mainserver/tftp/pxelinux.cfg/default
index ec0c12a..ec0c12a 120000
--- a/srv/tftp/pxelinux.cfg/default
+++ b/examples/mainserver/tftp/pxelinux.cfg/default