[debian-lan-devel] [debian-lan] 01/03: Minor fixes and improvements.

[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 1bf7d9c55fe3e6c8df25e2d8345c3ff1d36f46f8
Author: Andreas B. Mundt <andi at debian.org>
Date:   Fri Jun 13 09:50:10 2014 +0200

    Minor fixes and improvements.
---
 fai/config/files/etc/fai/NFSROOT/FAISERVER | 2 +-
 fai/config/hooks/savelog.LAST.source       | 2 +-
 fai/config/package_config/FAISERVER        | 2 +-
 fai/config/package_config/LDAP_CLIENT      | 3 +++
 fai/config/scripts/KDC_LDAP/10-slapd-KDC   | 2 ++
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/fai/config/files/etc/fai/NFSROOT/FAISERVER b/fai/config/files/etc/fai/NFSROOT/FAISERVER
index de24c5b..d83dcd5 100644
--- a/fai/config/files/etc/fai/NFSROOT/FAISERVER
+++ b/fai/config/files/etc/fai/NFSROOT/FAISERVER
@@ -6,7 +6,7 @@ rsync lftp less dump reiserfsprogs e2fsprogs usbutils
 hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
 dnsutils ntpdate dosfstools xfsprogs xfsdump
 procinfo numactl dialog
-console-tools console-common kbd
+console-common kbd
 iproute moreutils udev subversion
 xz-utils
 cupt
diff --git a/fai/config/hooks/savelog.LAST.source b/fai/config/hooks/savelog.LAST.source
index b873daa..07b9d5a 100755
--- a/fai/config/hooks/savelog.LAST.source
+++ b/fai/config/hooks/savelog.LAST.source
@@ -185,7 +185,7 @@ fi
 
 if [ -s $errfile ]; then
    echo "ERRORS reported in ${errfile}:"
-   cat $errfile | nl
+   nl $errfile
    echo "ERRORS found in log files. See above and $errfile" >&2
 else
    echo "Congratulations! No errors found in log files."
diff --git a/fai/config/package_config/FAISERVER b/fai/config/package_config/FAISERVER
index 07ce5b2..f721859 100644
--- a/fai/config/package_config/FAISERVER
+++ b/fai/config/package_config/FAISERVER
@@ -4,7 +4,7 @@ fai-quickstart
 isc-dhcp-client
 debmirror tcpdump
 apache2
-genisoimage grub-pc
+xorriso grub-pc
 lftp
 syslinux-common
 
diff --git a/fai/config/package_config/LDAP_CLIENT b/fai/config/package_config/LDAP_CLIENT
index 671ff47..bc4000f 100644
--- a/fai/config/package_config/LDAP_CLIENT
+++ b/fai/config/package_config/LDAP_CLIENT
@@ -2,4 +2,7 @@
 ## Put all setup-dependent packages in the SETUP_* class.
 PACKAGES aptitude
 libnss-ldapd
+# use nslcd, pynslcd does not work yet:
+nslcd
+
 ldap-utils
diff --git a/fai/config/scripts/KDC_LDAP/10-slapd-KDC b/fai/config/scripts/KDC_LDAP/10-slapd-KDC
index 49ac798..4da2440 100755
--- a/fai/config/scripts/KDC_LDAP/10-slapd-KDC
+++ b/fai/config/scripts/KDC_LDAP/10-slapd-KDC
@@ -71,6 +71,8 @@ adminPW() {
 		dialog --stdout --msgbox "Entering passwords canceled, please try again." 5 50
             elif [ "$inp1" == "$inp2" ] ; then
 		ADMINPW=$inp1
+		dialog --stdout  --title " LDAP and KDC " \
+                    --infobox "Initializing LDAP database and Kerberos KDC.\n\n This may take some time, please be patient." 5 48
 		echo "Password for admin set."
             else
 		dialog --stdout --msgbox "Passwords do not match, please try again." 5 45

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