[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.10-5-gc4efeaf

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit c4efeafb7f4496ca77083c8f6dc72814ff381edf
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun May 19 11:29:08 2013 +0200

    Allow defining FAI variables at boot.  No unnecessary modules loaded.
    
    By default, the user will be prompted for the root and admin password
    during installation, as well as for the setup variant to be chosen.
    If the variables ROOTPW, ADMINPW, MAINSERVER_IPADDR and GATEWAY are
    defined on the kernel boot command line, the installation will not
    prompt for any input. This simplifies automatic testing.
    
    Remove all modules from the list to be loaded at boot time, as these
    modules are loaded automatically.  Add the module 'loop', as it's
    added in Debian Wheezy installations too.

diff --git a/fai/config/class/CLIENT_A.var b/fai/config/class/CLIENT_A.var
index 6743e5b..340da64 100644
--- a/fai/config/class/CLIENT_A.var
+++ b/fai/config/class/CLIENT_A.var
@@ -19,11 +19,5 @@ ROOTPW='*'
 ## Set empty to skip this feature.
 APT_URL="http://www.intern/debian/"
 
-# 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
-# in 20-hwdetect.source. But discover should do most of this job
-MODULESLIST="usbkbd ehci-hcd ohci-hcd uhci-hcd usbhid psmouse"
-
 # erros in tasks greater than this value will cause the installation to stop
 STOP_ON_ERROR=700
diff --git a/fai/config/class/DEBIAN.var b/fai/config/class/DEBIAN.var
index a46a885..d1ac5da 100644
--- a/fai/config/class/DEBIAN.var
+++ b/fai/config/class/DEBIAN.var
@@ -5,5 +5,4 @@ KEYMAP=us-latin1
 # not during installation these modules will be written to /etc/modules
 # If you need a module during installation, add it to $kernelmodules
 # in 20-hwdetect.source.
-MODULESLIST="usbkbd ehci-hcd ohci-hcd uhci-hcd usbhid psmouse"
-
+MODULESLIST="loop"
diff --git a/fai/config/class/FAIBASE.var b/fai/config/class/FAIBASE.var
index 6f1a529..82f33b0 100644
--- a/fai/config/class/FAIBASE.var
+++ b/fai/config/class/FAIBASE.var
@@ -9,7 +9,7 @@ TIMEZONE=Europe/Berlin
 
 # root password for the new installed linux system; md5 and crypt are possible
 # pw is "fai"
-ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
+#ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 
 # errors in tasks greater than this value will cause the installation to stop
 STOP_ON_ERROR=700
diff --git a/fai/config/class/SERVER_A.var b/fai/config/class/SERVER_A.var
index 8ea8229..4bfae82 100644
--- a/fai/config/class/SERVER_A.var
+++ b/fai/config/class/SERVER_A.var
@@ -18,7 +18,9 @@ USERNAME=""
 # pw is "fai":
 #ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 # If $ROOTPW is empty, you will be prompted during installation:
-ROOTPW=''
+ROOTPW=${ROOTPW:-''}
+# If $ADMINPW is empty, you will be prompted during installation:
+ADMINPW=${ADMINPW:-''}
 
 ## All sensible data will end up here (see below):
 DATADIR=/root/installation/
@@ -35,13 +37,12 @@ LDAP_ADMIN_PW=
 ## Variables that define the network.  You can choose the same IP
 ## address for mainserver ($MAINSERVER_IPADDR) and gateway ($GATEWAY)
 ## interactively during installation, see below.
-MAINSERVER_IPADDR="10.0.0.10"
-GATEWAY="10.0.0.1"
-BROADCAST="10.0.255.255"
+MAINSERVER_IPADDR=${MAINSERVER_IPADDR:-''}
+GATEWAY=${GATEWAY:-''}
+BROADCAST=${BROADCAST:-'10.0.255.255'}
 NAMESERVER_IPADDR=""  # leave empty to use mainserver's IP address
 
-if [ "$GATEWAY" != "$MAINSERVER_IPADDR" ] && \
-   [ "$FAI_ACTION" == "install" ] || [ "$CONVERT" == "true" ] ; then
+if [ -z "$GATEWAY" ] || [ -z "$MAINSERVER_IPADDR" ] ; then
     ## Dialog to choose setup:
     inp=$(dialog --insecure --stdout --backtitle " Network Setup " --radiolist \
         "There are two variants available:\n\n\
@@ -49,10 +50,14 @@ if [ "$GATEWAY" != "$MAINSERVER_IPADDR" ] && \
              are separate machines.\n\n\
    COMBINED: The mainserver is configured as gateway\n\
              to the external network (2 NICs needed)." 15 63 2 \
-        SEPARATE " mainserver: ${MAINSERVER_IPADDR}, gateway: ${GATEWAY} " on \
-        COMBINED " mainserver == gateway: ${GATEWAY}, 2 NICs " off )
+        SEPARATE " mainserver: 10.0.0.10, gateway: 10.0.0.1 " on \
+        COMBINED " mainserver == gateway: 10.0.0.1, 2 NICs " off )
     if [ "$inp" = "COMBINED" ] ; then
-        MAINSERVER_IPADDR=$GATEWAY
+        MAINSERVER_IPADDR='10.0.0.1'
+        GATEWAY='10.0.0.1'
+    else
+        MAINSERVER_IPADDR='10.0.0.10'
+        GATEWAY='10.0.0.1'
     fi
     unset inp
 fi
@@ -79,11 +84,5 @@ APT_REPO_DIR="/var/www/debian/"
 ## Set empty to skip this feature.
 APT_URL="http://www.intern/debian/"
 
-# 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
-# in 20-hwdetect.source. But discover should do most of this job
-MODULESLIST="usbkbd ehci-hcd ohci-hcd uhci-hcd usbhid psmouse"
-
 # erros in tasks greater than this value will cause the installation to stop
 STOP_ON_ERROR=700

-- 
Debian-LAN development and packaging