[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 9f90afbc623aaff69ef9235d0fff6b6e2695f688

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 8ba5a94e3438ddaf91dd14e88b10643c3f707187
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Fri Feb 17 18:23:58 2012 +0100

    Cleanup FAISERVER/SERVER_A class and change default password to 'fai'.
    
    Do not create a local user by default.
    Use password 'fai' as default.  It is used in the fai-doc examples.
    Remove unnecessary FAISETUP varible.  Activating rc.local has to be done
    manually after installation.  A messages displayed after boot already
    explains how to do that.

diff --git a/fai/config/class/CLIENT_A.var b/fai/config/class/CLIENT_A.var
index cb05097..5e36bec 100644
--- a/fai/config/class/CLIENT_A.var
+++ b/fai/config/class/CLIENT_A.var
@@ -11,8 +11,8 @@ UTC=yes
 TIMEZONE=Europe/Berlin
 
 # Use: 'mkpasswd -Hsha-256 <PASSWORD>' to create the password hash
-# pw is "123":
-ROOTPW='$5$1bCKX.c.x29$jz18.yheofg56Pmjav9GJEQCygrZeju8Fqa3LgV04U2'
+# pw is "fai":
+ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 
 # MODULESLIST contains modules that will be loaded by the new system,
 # not during installation these modules will be written to /etc/modules
diff --git a/fai/config/class/SERVER_A.var b/fai/config/class/SERVER_A.var
index 8cc3fc1..c43aed3 100644
--- a/fai/config/class/SERVER_A.var
+++ b/fai/config/class/SERVER_A.var
@@ -11,12 +11,14 @@ UTC=yes
 TIMEZONE=Europe/Berlin
 
 # Local user and root password for the new installed linux system
-USERNAME="localadmin"
+# Leave empty if no local user apart from root is needed.
+USERNAME=""
+
 # Use: 'mkpasswd -Hsha-256 <PASSWORD>' to create the password hash
-# pw is "123":
-ROOTPW='$5$1bCKX.c.x29$jz18.yheofg56Pmjav9GJEQCygrZeju8Fqa3LgV04U2'
+# pw is "fai":
+ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 
-## All sensible data will end up here (see below): 
+## All sensible data will end up here (see below):
 DATADIR=/root/installation/
 
 ## The Kerberos KDC master password in clear text (!).  If undefined
@@ -28,10 +30,6 @@ KDC_MASTER_PW=
 ## created and saved in $DATADIR.
 LDAP_ADMIN_PW=
 
-## Run fai-setup and some other initializations on first boot.  
-## See 'files/etc/rc.local'.
-FAISETUP=true
-
 # MODULESLIST contains modules that will be loaded by the new system,
 # not during installation these modules will be written to /etc/modules
 # If you need a module during installation, add it to $kernelmodules
diff --git a/fai/config/scripts/FAISERVER/10-config b/fai/config/scripts/FAISERVER/10-config
index 66a866c..646a863 100755
--- a/fai/config/scripts/FAISERVER/10-config
+++ b/fai/config/scripts/FAISERVER/10-config
@@ -4,7 +4,5 @@ fcopy -r /etc/fai
 
 if [ $FAI_ACTION = "install" ]; then
     fcopy  /etc/dhcp/dhcpd.conf
-    if $FAISETUP ; then
-	fcopy  /etc/rc.local
-    fi
+    fcopy  /etc/rc.local
 fi
diff --git a/fai/config/scripts/SERVER_A/10-localadmin b/fai/config/scripts/SERVER_A/10-localadmin
index 6682716..bf38dae 100755
--- a/fai/config/scripts/SERVER_A/10-localadmin
+++ b/fai/config/scripts/SERVER_A/10-localadmin
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-## Add a local user account:
+## Add a local user account.
+## You need to define USERNAME in class/SERVER_A.var to enable:
+
 if [ ! -z $USERNAME ] && ! $ROOTCMD getent passwd $USERNAME ; then
     $ROOTCMD adduser --disabled-login \
 	--gecos "local system administrator" $USERNAME

-- 
Debian-LAN development and packaging