[debian-lan-devel] [debian-lan] 02/08: Fix NFSROOT and PXE booting.

[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 100e0e797c949209dacfc5bd873faf3694a827db
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Aug 7 11:19:24 2016 +0200

    Fix NFSROOT and PXE booting.
---
 fai/config/files/etc/fai/NFSROOT/FAISERVER         | 33 ++++++++++------------
 .../usr/local/sbin/debian-lan-chroots/FAISERVER    |  7 +++--
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/fai/config/files/etc/fai/NFSROOT/FAISERVER b/fai/config/files/etc/fai/NFSROOT/FAISERVER
index 3fb5392..63fdc90 100644
--- a/fai/config/files/etc/fai/NFSROOT/FAISERVER
+++ b/fai/config/files/etc/fai/NFSROOT/FAISERVER
@@ -1,40 +1,37 @@
 # package list for creating the NFSROOT
 
-PACKAGES aptitude
+PACKAGES install
 
-sysvinit-core # use this for booting stretch without systemd
-
-nfs-common fai-nfsroot module-init-tools ssh rdate lshw rpcbind
-rsync lftp less dump reiserfsprogs e2fsprogs usbutils
+nfs-common fai-nfsroot ssh rdate lshw rpcbind
+rsync lftp less dump e2fsprogs usbutils
 hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
-dnsutils ntpdate dosfstools xfsprogs xfsdump
+dnsutils ntpdate dosfstools xfsprogs xfsdump btrfs-tools
 procinfo numactl dialog
 console-common kbd
-iproute moreutils udev subversion
+iproute2 moreutils udev
 xz-utils
-cupt
 pxelinux syslinux-common
 
-cfengine2
-# we need mkpasswd:
-whois
+# debian-lan needs mkpasswd and cfagent:
+whois cfengine2
 
 # some network cards needs firmware
 #firmware-bnx2 firmware-bnx2x firmware-realtek
+#firmware-linux-nonfree
 
-# dracut can replace live-boot
-dracut-network live-boot- live-boot-initramfs-tools-
-
-# choose if you like live-boot or dracut inside the nfsroot
-#live-boot live-boot-doc
+# dracut
+curl ## FIXME: needed to configure dracut
+dracut dracut-network dracut-config-generic
 
 # you should not edit the lines below
 # architecture dependend list of packages that are installed
 
-PACKAGES aptitude I386
+sysvinit-core systemd-sysv-
+
+PACKAGES install I386
 grub-pc
 linux-image-686-pae
 
-PACKAGES aptitude AMD64
+PACKAGES install AMD64
 grub-pc
 linux-image-amd64
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 ee09fd4..b292601 100755
--- a/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
+++ b/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
@@ -52,7 +52,8 @@ default Debian-LAN workstation
 
 label Debian-LAN workstation
 kernel $KERNEL
-append initrd=$INITRD ip=dhcp root=nfs4:/$(basename $NFSROOT) aufs FAI_FLAGS=verbose,sshd,createvt FAI_CONFIG_SRC=nfs://faiserver/config FAI_ACTION=install
+## FIXME: NFSv4 # append initrd=$INITRD ip=dhcp root=nfs:/$(basename $NFSROOT) rootovl FAI_FLAGS=verbose,sshd,createvt FAI_CONFIG_SRC=nfs://faiserver/config FAI_ACTION=install
+append initrd=$INITRD ip=dhcp root=nfs:/srv/nfs4/$(basename $NFSROOT) rootovl FAI_FLAGS=verbose,sshd,createvt FAI_CONFIG_SRC=nfs://faiserver/config FAI_ACTION=install
 EOF
 
     ## Create pxelinux boot configuration for workstationXX.
@@ -101,8 +102,8 @@ default Debian-LAN/FAI Live System
 
 label Debian-LAN/FAI Live System
 kernel $KERNEL
-## 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
+## FIXME: NFSv4 # append initrd=$INITRD ip=dhcp root=nfs:/$(basename $DLROOT) rootovl
+append initrd=$INITRD ip=dhcp root=/dev/nfs nfsroot=/srv/nfs4/live rootovl
 EOF
 
     ## Create pxelinux boot configuration for disklessXX.

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