[debian-lan-devel] [debian-lan] 01/01: Fixes for fai-cd.

[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 80b0e26be7012d7aa6722f1a655d53a745c16c21
Author: Andreas B. Mundt <andi at debian.org>
Date:   Tue Aug 16 19:11:35 2016 +0200

    Fixes for fai-cd.
---
 debian/README.Debian                       | 7 +------
 fai/config/files/etc/fai/grub.cfg/SERVER_A | 5 +++--
 fai/config/scripts/FAISERVER/50-di-netboot | 2 +-
 fai/config/scripts/SERVER_A/10-misc        | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 5c09e82..ba4948b 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -29,15 +29,10 @@ Create the CD image in the following way:
    cp -b /srv/fai/config/files/etc/fai/nfsroot.conf/SERVER_A /etc/fai/nfsroot.conf
    cp -b /srv/fai/config/files/etc/fai/apt/sources.list/SERVER_A /etc/fai/apt/sources.list
 
-Use live-boot for the fai-cd:
-
-    sed -i -r -e "s/^(dracut.*$)/\#\1/" /etc/fai/NFSROOT
-    sed -i -r -e "s/^\#(live-boot.*)/\1/" /etc/fai/NFSROOT
-
 Adapt the config space to your needs if necessary and create the FAI
 nfsroot:
 
-   fai-make-nfsroot -v -l
+   fai-make-nfsroot -v
 
 The CD image is then created by fai-cd:
 
diff --git a/fai/config/files/etc/fai/grub.cfg/SERVER_A b/fai/config/files/etc/fai/grub.cfg/SERVER_A
index b0507e8..c625178 100644
--- a/fai/config/files/etc/fai/grub.cfg/SERVER_A
+++ b/fai/config/files/etc/fai/grub.cfg/SERVER_A
@@ -49,7 +49,7 @@ menuentry "" {
 menuentry " Fully Automatic Installation - Debian-LAN:  mainserver" {
     set gfxpayload=$resolution
     set root=(cd)
-    linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=mainserver FAI_CONFIG_SRC=file:///var/lib/fai/config
+    linux /boot/vmlinuz FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=mainserver FAI_CONFIG_SRC=file:///var/lib/fai/config rd.live.image root=live:CDLABEL=FAI_CD rd.neednet ip=dhcp
     initrd  /boot/initrd.img
 }
 
@@ -57,13 +57,14 @@ menuentry " Fully Automatic Installation - Debian-LAN:  gateway" {
     set gfxpayload=$resolution
     set root=(cd)
     linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=gateway FAI_CONFIG_SRC=file:///var/lib/fai/config
+    linux /boot/vmlinuz FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=gateway FAI_CONFIG_SRC=file:///var/lib/fai/config rd.live.image root=live:CDLABEL=FAI_CD rd.neednet ip=dhcp
     initrd  /boot/initrd.img
 }
 
 menuentry " FAI - System Information" {
     set gfxpayload=$resolution
     set root=(cd)
-    linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=mainserver FAI_CONFIG_SRC=file:///var/lib/fai/config
+    linux /boot/vmlinuz FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=mainserver FAI_CONFIG_SRC=file:///var/lib/fai/config rd.live.image root=live:CDLABEL=FAI_CD rd.neednet ip=dhcp
     initrd  /boot/initrd.img
 }
 
diff --git a/fai/config/scripts/FAISERVER/50-di-netboot b/fai/config/scripts/FAISERVER/50-di-netboot
index ca205e0..52a7698 100755
--- a/fai/config/scripts/FAISERVER/50-di-netboot
+++ b/fai/config/scripts/FAISERVER/50-di-netboot
@@ -101,7 +101,7 @@ EOF
 fi
 
 $ROOTCMD mkdir -p /srv/tftp/di-netboot-pkg/
-$ROOTCMD ainsl /etc/fstab "/usr/lib/debian-installer/  /srv/tftp/di-netboot-pkg/  none  bind  0  0"
+ainsl /etc/fstab "/usr/lib/debian-installer/  /srv/tftp/di-netboot-pkg/  none  bind  0  0"
 $ROOTCMD di-netboot-assistant -v rebuild-menu
 
 # chain.c32 is needed to boot from the local hard disk:
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index 311f9ad..814e2b9 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -38,7 +38,7 @@ if [ "$FAI_ACTION" != "install" ] && [ "$CONVERT" != "true" ] ; then
 fi
 
 ## Listen to DHCP requests on the local interface:
-$ROOTCMD sed -i "s/\(^INTERFACESv4=*\)/\#\1/" $target/etc/default/isc-dhcp-server
+$ROOTCMD sed -i "s/\(^INTERFACESv4=*\)/\#\1/" /etc/default/isc-dhcp-server
 ainsl -v /etc/default/isc-dhcp-server "INTERFACESv4=\"${NIC_LABEL0}\""
 
 ## Generate '/etc/network/interfaces':

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