[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-32-g21f7955

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 21f795534c4abffbac67c6ba73ee27ea6443f722
Author: Andreas B. Mundt <andi at debian.org>
Date:   Tue Aug 28 13:29:36 2012 +0200

    Cosmetics and cleanup.  No system-wide readable home directories.

diff --git a/fai/config/debconf/SERVER_A b/fai/config/debconf/SERVER_A
index df40a9f..23ded94 100644
--- a/fai/config/debconf/SERVER_A
+++ b/fai/config/debconf/SERVER_A
@@ -1,2 +1,4 @@
-# Network interfaces on which the DHCP server should listen:
+## Network interfaces on which the DHCP server should listen:
 isc-dhcp-server isc-dhcp-server/interfaces string eth0
+## Do you want system-wide readable home directories?
+adduser adduser/homedir-permission boolean false
diff --git a/fai/config/files/usr/sbin/debian-lan/SERVER_A b/fai/config/files/usr/sbin/debian-lan/SERVER_A
index efee0e2..c631e64 100755
--- a/fai/config/files/usr/sbin/debian-lan/SERVER_A
+++ b/fai/config/files/usr/sbin/debian-lan/SERVER_A
@@ -40,10 +40,11 @@ usage(){
     exit 1
 }
 
-nscd_restart(){
+sync_nscd(){
     if pidof nscd 1>&2 > /dev/null ; then
-	## Restart nscd to have database up to date:
-	/etc/init.d/nscd restart
+        ## Clear tables to have database up to date:
+	nscd -i passwd
+	nscd -i group
     fi
 }
 
@@ -92,7 +93,7 @@ shift
 
 case $COMMAND in
     adduser)
-	nscd_restart
+	sync_nscd
 	if [ -r $1 ] ; then
 	    ## We have a file, one user per line.
 	    chmod 600 $1
@@ -128,7 +129,7 @@ case $COMMAND in
 	fi
 	;;
     deluser)
-	nscd_restart
+	sync_nscd
 	if [ -r $1 ] ; then
 	    ## We have a file, one user per line.
 	    cat $1 | while read LINE; do
diff --git a/fai/config/hooks/savelog.LAST.source b/fai/config/hooks/savelog.LAST.source
index cb42234..d30d030 100755
--- a/fai/config/hooks/savelog.LAST.source
+++ b/fai/config/hooks/savelog.LAST.source
@@ -144,7 +144,7 @@ fi
 # Here you can define your own patterns. Put one pattern in a line,
 # do not create empty lines.
 myerrorpatterns="XXXXX"
-myignorepatterns="XXXXX"
+myignorepatterns="create mode"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # The main routine
 errorpatterns="$globalerrorpatterns
diff --git a/fai/config/scripts/DESKTOP/20-default-desktop b/fai/config/scripts/DESKTOP/20-default-desktop
index 70f0114..a34be7c 100755
--- a/fai/config/scripts/DESKTOP/20-default-desktop
+++ b/fai/config/scripts/DESKTOP/20-default-desktop
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## Uncomment to make LXDE the default desktop:
+## Choose the default desktop:
 
 #$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startlxde
 $ROOTCMD update-alternatives --set x-session-manager /usr/bin/startxfce4

-- 
Debian-LAN development and packaging