[debian-lan-devel] [debian-lan] 02/04: Workarounds: #759424 (di-n-a) removed, #774033 (deadlock) added.

[Andreas B. Mundt]

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

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

commit 966c6269da313b2b6dea77d19e54f469f7095cef
Author: Andreas B. Mundt <andi at debian.org>
Date:   Wed Feb 18 20:44:00 2015 +0100

    Workarounds: #759424 (di-n-a) removed, #774033 (deadlock) added.
    
    (cherry picked from commit 32a3ef6c004419ce21a233b93cb4f5d855c164f8)
---
 .../files/usr/local/sbin/debian-lan-chroots/FAISERVER     |  3 ++-
 fai/config/scripts/FAISERVER/50-di-netboot                | 15 ++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER b/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
index 4f4950a..ade92d5 100755
--- a/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
+++ b/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
@@ -101,7 +101,8 @@ default Debian-LAN/FAI Live System
 
 label Debian-LAN/FAI Live System
 kernel $KERNEL
-append initrd=$INITRD ip=dhcp root=nfs4:/$(basename $DLROOT) aufs
+## FIXME #774033 ## append initrd=$INITRD ip=dhcp root=nfs4:/$(basename $DLROOT) aufs
+append initrd=initrd.img ip=dhcp root=/dev/nfs nfsroot=/srv/nfs4/live aufs
 EOF
 
     ## Create pxelinux boot configuration for disklessXX.
diff --git a/fai/config/scripts/FAISERVER/50-di-netboot b/fai/config/scripts/FAISERVER/50-di-netboot
index 47644f5..0f83e3f 100755
--- a/fai/config/scripts/FAISERVER/50-di-netboot
+++ b/fai/config/scripts/FAISERVER/50-di-netboot
@@ -5,9 +5,6 @@ set -e
 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
@@ -21,7 +18,8 @@ EOF
 LABEL Debian-LAN Live System
        MENU LABEL Debian-LAN Live System
        KERNEL ::/fai/vmlinuz
-       APPEND initrd=::/fai/initrd.img ip=dhcp root=nfs4:/live aufs
+       ## FIXME #774033 ## APPEND initrd=::/fai/initrd.img ip=dhcp root=nfs4:/live aufs
+       APPEND initrd=::/fai/initrd.img ip=dhcp root=/dev/nfs nfsroot=/srv/nfs4/live aufs
 EOF
     fi
 
@@ -41,7 +39,6 @@ TIMEOUT 30
 
 EOF
     sed -i "s%^\(TFTP_ROOT=.*\)$%\#\1\nTFTP_ROOT=/srv/tftp%" ${target}/etc/di-netboot-assistant/di-netboot-assistant.conf
-    sed -i "s%^#\($DISTRI\)%\1%"                             ${target}/etc/di-netboot-assistant/di-sources.list
 
     mkdir -p ${target}/var/www/html/d-i/$DISTRI
     cat > "${target}/var/www/html/d-i/$DISTRI/preseed.cfg" <<EOF
@@ -107,12 +104,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; 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
-done
+# chain.c32 is needed to boot from the local hard disk:
+$ROOTCMD cp /usr/lib/syslinux/modules/bios/chain.c32 /srv/tftp/debian-installer/
 
 #wheezy:
 #d-i preseed/late_command string mkdir -p /target/var/lib/fai/config; \

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