[debian-lan-devel] [debian-lan] 03/07: Merge FAI 4.2.3 modifications.

[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 50704a8c1da63619ae02a6ba3b9200e117c3ab74
Author: Andreas B. Mundt <andi at debian.org>
Date:   Thu Sep 11 10:08:36 2014 +0200

    Merge FAI 4.2.3 modifications.
---
 fai/config/files/etc/fai/NFSROOT/FAISERVER      | 3 +++
 fai/config/files/etc/fai/nfsroot.conf/FAISERVER | 6 ++----
 fai/config/files/etc/fai/nfsroot.conf/SERVER_A  | 5 ++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fai/config/files/etc/fai/NFSROOT/FAISERVER b/fai/config/files/etc/fai/NFSROOT/FAISERVER
index d83dcd5..166af75 100644
--- a/fai/config/files/etc/fai/NFSROOT/FAISERVER
+++ b/fai/config/files/etc/fai/NFSROOT/FAISERVER
@@ -1,6 +1,9 @@
 # package list for creating the NFSROOT
 
 PACKAGES aptitude
+
+#sysvinit-core # use this for booting jessie without systemd
+
 nfs-common fai-nfsroot module-init-tools ssh rdate lshw rpcbind
 rsync lftp less dump reiserfsprogs e2fsprogs usbutils
 hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
diff --git a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
index fa699e1..274baf8 100644
--- a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
+++ b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
@@ -1,14 +1,12 @@
 # For a detailed description see nfsroot.conf(5)
 
+FAI_DEBOOTSTRAP="jessie http://http.debian.net/debian"
 FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 
 NFSROOT=/srv/fai/nfsroot
 TFTPROOT=/srv/tftp/fai
 NFSROOT_HOOKS=/etc/fai/nfsroot-hooks/
-FAI_DEBOOTSTRAP_OPTS="--exclude=info"
+FAI_DEBOOTSTRAP_OPTS="--exclude=info --include=aptitude"
 
 # Configuration space
 FAI_CONFIGDIR=/srv/fai/config
-
-NFSROOT_ETC_HOSTS="192.168.33.250 faiserver"
-FAI_DEBOOTSTRAP="jessie http://http.debian.net/debian"
diff --git a/fai/config/files/etc/fai/nfsroot.conf/SERVER_A b/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
index 46d5c03..274baf8 100644
--- a/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
+++ b/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
@@ -1,13 +1,12 @@
 # For a detailed description see nfsroot.conf(5)
 
+FAI_DEBOOTSTRAP="jessie http://http.debian.net/debian"
 FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 
 NFSROOT=/srv/fai/nfsroot
 TFTPROOT=/srv/tftp/fai
 NFSROOT_HOOKS=/etc/fai/nfsroot-hooks/
-FAI_DEBOOTSTRAP_OPTS="--exclude=info"
+FAI_DEBOOTSTRAP_OPTS="--exclude=info --include=aptitude"
 
 # Configuration space
 FAI_CONFIGDIR=/srv/fai/config
-
-FAI_DEBOOTSTRAP="jessie http://http.debian.net/debian"

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