[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.11-3-g5dbdabd

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 5dbdabd430795ecd3e90d3e3d5a19749820240da
Author: Andreas B. Mundt <andi at debian.org>
Date:   Thu May 23 10:39:13 2013 +0200

    Add disk_config/ROAMING.  Modify FAI config space access.  Cleanup.
    
    Add a partition with extra space on roaming machines for local data.
    
    Change the netmask of the FAI config space.  Allow access from unknown
    machines.  There are no secrets left in the config space.

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index a0de7bc..09e8ecc 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -55,7 +55,7 @@ case $HOSTNAME in
     demohost|client*)
        echo "FAIBASE DEBIAN DHCPC DEMO" ;;
     xfcehost)
-        echo "FAIBASE DEBIAN DHCPC DEMO XORG XFCE" ;;
+       echo "FAIBASE DEBIAN DHCPC DEMO XORG XFCE" ;;
     gnomehost)
        echo "FAIBASE DEBIAN DHCPC DEMO XORG GNOME" ;;
     atom*)
@@ -73,7 +73,7 @@ case $HOSTNAME in
 ## general workstation* case and add a specializing class:
 #    workstation00)
 #        echo "FAIBASE DEBIAN DHCPC $WORKSTATION_A XORG DESKTOP SPECIAL" ;;
-## And/or add ROAMING class to cache credentials for offline use:
+## And/or add ROAMING class to cache credentials for off-line use:
 #        echo "FAIBASE DEBIAN DHCPC $WORKSTATION_A XORG DESKTOP ROAMING" ;;
     workstation*)
         ## You might want to add some localization class like:
diff --git a/fai/config/class/SERVER_A.var b/fai/config/class/SERVER_A.var
index 3028380..39128f2 100644
--- a/fai/config/class/SERVER_A.var
+++ b/fai/config/class/SERVER_A.var
@@ -67,7 +67,7 @@ NETMASK="255.255.0.0"
 SUBNETMASK="10.0.0.0/16"
 
 ## NETMASK for FAI config space access:
-FAINETMASK="10.0.0.0/24"
+FAINETMASK=${FAINETMASK:-'10.0.0.0/16'}
 
 ## DHCP range for unknown clients (cf. dhcpd.conf):
 RANGE="10.0.1.10 10.0.1.200"
diff --git a/fai/config/disk_config/LVM5_A b/fai/config/disk_config/ROAMING
similarity index 76%
copy from fai/config/disk_config/LVM5_A
copy to fai/config/disk_config/ROAMING
index 187bc62..9e10e97 100644
--- a/fai/config/disk_config/LVM5_A
+++ b/fai/config/disk_config/ROAMING
@@ -7,4 +7,5 @@ disk_config lvm
 vg  vg_system  disk1.5
 vg_system-root  /      500M-10G  ext4  errors=remount-ro
 vg_system-usr   /usr   3G-20G    ext4  defaults
-vg_system-var   /var   1G-70%    ext4  defaults
+vg_system-var   /var   1G-30%    ext4  defaults
+vg_system-lan   /lan   1G-50%    ext4  defaults
diff --git a/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5 b/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
index cc21e53..ec422e2 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
+++ b/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
@@ -11,11 +11,12 @@ cat > $FILE <<EOF
 #!/bin/sh
 #
 set -e
-if [ \$PAM_USER = "root" ] || ls /tmp/krb5cc_diskless > /dev/null 2>&1; then
+FILE=/tmp/krb5cc_diskless
+
+if [ "\$PAM_USER" = "root" ] || [ -e /etc/krb5.keytab ] || [ -e \$FILE ] ; then
     exit 0
 fi
 
-FILE=/tmp/krb5cc_diskless
 cp -v /tmp/krb5cc_pam_* \$FILE
 /etc/init.d/autofs restart > /dev/null
 
diff --git a/fai/config/scripts/ROAMING/10-home_nfs4_krb5 b/fai/config/scripts/ROAMING/10-home_nfs4_krb5
index 9b6b6d3..03e6938 100755
--- a/fai/config/scripts/ROAMING/10-home_nfs4_krb5
+++ b/fai/config/scripts/ROAMING/10-home_nfs4_krb5
@@ -14,7 +14,7 @@ set -e
 FILE=/tmp/krb5cc_roaming
 HOMEDIR=/home/\$PAM_USER
 
-if [ \$PAM_USER = "root" ] ; then
+if [ "\$PAM_USER" = "root" ] ; then
     exit 0
 elif [ ! -d \$HOMEDIR ] ; then
     cp -pR /etc/skel \$HOMEDIR

-- 
Debian-LAN development and packaging