[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-47-g533e34b

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 533e34ba3bb9d373932d60e3f8a9210396dea139
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sat Sep 29 13:22:36 2012 +0200

    Use debian-installer-*-netboot package for PXE installation option.

diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index 6d656e4..e150ef9 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -7,8 +7,7 @@ set -e
 ############################
 TIMEOUT=120
 URL="http.debian.net"
-URLIMGi386="http://http.us.debian.org/debian/dists/wheezy/main/installer-i386/current/images/netboot/netboot.tar.gz"
-URLIMGamd64="http://http.us.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/netboot.tar.gz"
+INSTALLER="/usr/lib/debian-installer/images/*/*/text/debian-installer/"
 
 DLROOT="/opt/live"
 . /etc/fai/fai.conf
@@ -42,11 +41,9 @@ setup_nfsroot () {
 }
 
 setup_PXEinstaller () {
-    ## Add Debian PXE Installer:
-    wget --output-document=$TFTPROOT/netboot_i386.tar.gz $URLIMGi386 && \
-	tar xvf $TFTPROOT/netboot_i386.tar.gz -C $TFTPROOT ./debian-installer/
-    wget --output-document=$TFTPROOT/netboot_amd64.tar.gz $URLIMGamd64 && \
-	tar xvf $TFTPROOT/netboot_amd64.tar.gz -C $TFTPROOT ./debian-installer/
+    ## Add Debian PXE Installer.
+    ## Copy stuff, symlinks do not work (chroot environment):
+    cp -r $INSTALLER $TFTPROOT
     append2PXEmenu
 }
 
diff --git a/fai/config/package_config/FAISERVER b/fai/config/package_config/FAISERVER
index dd5875b..f917bca 100644
--- a/fai/config/package_config/FAISERVER
+++ b/fai/config/package_config/FAISERVER
@@ -11,3 +11,7 @@ syslinux-common
 apt-cacher-ng
 whois
 git
+
+## PXE installer:
+debian-installer-7.0-netboot-i386
+debian-installer-7.0-netboot-amd64

-- 
Debian-LAN development and packaging