[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.7-30-geac8728

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit eac87284480120939f1ce9824816c551911e0506
Author: Andreas B. Mundt <andi at debian.org>
Date:   Thu Mar 7 17:27:01 2013 +0100

    Send all mail for root to 'admin', also for conversions.
    
    If already a local user receives root's mail, this user is replaced by
    'admin'.

diff --git a/fai/config/scripts/KDC_LDAP/10-slapd-KDC b/fai/config/scripts/KDC_LDAP/10-slapd-KDC
index c99dbcb..49ac798 100755
--- a/fai/config/scripts/KDC_LDAP/10-slapd-KDC
+++ b/fai/config/scripts/KDC_LDAP/10-slapd-KDC
@@ -220,7 +220,11 @@ init_KDC() {
 	$ROOTCMD chmod -R o-rwx $HOMEDIR
 	$ROOTCMD chown -R $USID:$GRID $HOMEDIR
 	## Forward all mail for root to admin:
-	ainsl /etc/aliases "root: admin"
+	if $(grep -q "^root: .*$" $target/etc/aliases) ; then
+	    sed -i "s/^root: .*$/root: admin/" $target/etc/aliases
+	else
+	    ainsl /etc/aliases "root: admin"
+	fi
     fi
     $ROOTCMD kadmin.local -q "modify_policy -minlength 4 -minclasses 2 default"
 

-- 
Debian-LAN development and packaging