[debian-lan-devel] [debian-lan] 01/02: Fix some issues with di-netboot-assistant and preseeding.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit 6b18e91c73bb3145ee134c8af6a3fc46b4990d00
Author: Andreas B. Mundt <andi at debian.org>
Date:   Wed Dec 31 10:22:06 2014 +0100

    Fix some issues with di-netboot-assistant and preseeding.
    
    Adapt to the modified format of '/etc/debian_version'; (closes #774035).
    Enable 'jessie' repositories in '/etc/di-netboot-assistant/di-sources.list'.
    Preseed the grub installation and add 'chain.c32' to the PXE-boot files to
    allow booting from the local hard disk.
---
 fai/config/scripts/FAISERVER/50-di-netboot | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/fai/config/scripts/FAISERVER/50-di-netboot b/fai/config/scripts/FAISERVER/50-di-netboot
index 64a4796..47644f5 100755
--- a/fai/config/scripts/FAISERVER/50-di-netboot
+++ b/fai/config/scripts/FAISERVER/50-di-netboot
@@ -2,10 +2,12 @@
 
 set -e
 
-DISTRI="$(sed s%/.*$%% ${target}/etc/debian_version)"
-
+DISTRI="jessie"
 
 if [ "$FAI_ACTION" == "install" ] || [ "$CONVERT" == "true" ] ; then
+    ## Enable jessie in di-netboot-assistant (FIXME #759424):
+    sed  -i "s/^#jessie/jessie/" ${target}/etc/di-netboot-assistant/di-sources.list
+
     cat >> "${target}/etc/di-netboot-assistant/pxelinux.HEAD" <<EOF
 LABEL Local Boot
        MENU LABEL Boot from local hard disk
@@ -88,8 +90,8 @@ tasksel tasksel/first multiselect
 #tasksel tasksel/desktop multiselect kde, xfce
 # Individual additional packages to install
 d-i pkgsel/include string fai-client nfs-common aptitude
-### FIXME: GRUB default does not work: #712907 #759737
-
+### GRUB on default disk:
+d-i grub-installer/bootdev string default
 ### This command is run just before the install finishes, it does all the FAI magic:
 d-i preseed/late_command string mkdir -p /target/var/lib/fai/config; \\
        in-target modprobe nfsv4; \\
@@ -105,8 +107,8 @@ $ROOTCMD di-netboot-assistant install $DISTRI --arch=amd64
 $ROOTCMD di-netboot-assistant install $DISTRI --arch=i386
 $ROOTCMD di-netboot-assistant rebuild-menu
 
-# FIXME: Bug #759424
-for FILE in ldlinux.c32 libcom32.c32 libutil.c32 ; do
+# FIXME: Bug #759424; chain.c32 is needed to boot from the local hard disk.
+for FILE in ldlinux.c32 libcom32.c32 libutil.c32 chain.c32 ; do
     if [ ! -e $target/srv/tftp/debian-installer/$FILE ] ; then
         $ROOTCMD cp /usr/lib/syslinux/modules/bios/$FILE /srv/tftp/debian-installer/
     fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git