[debian-lan-devel] Additional Parameter for installing automatic?

[Andreas Schockenhoff]

Hi,

Am 16.05.2013 20:43, schrieb Andreas Schockenhoff:
>
>> Can you provide a proper patch with some context around the changes? 
>> (If this is a modification in the config space of a debian-lan 
>> mainserver, use 'git diff' in /srv/fai/config/' after your 
>> modifications.)
> I will try this.
>
attached the patch with git diff -p -w

The use of the Variable MAINSERVER=SEPARATE or COMBINED would I explain 
in the wiki if this patch is included.

On the CD I think the best is the dialog.

regards Andreas Schockenhoff
-------------- next part --------------
diff --git a/class/SERVER_A.var b/class/SERVER_A.var
index 8ea8229..6772ff0 100644
--- a/class/SERVER_A.var
+++ b/class/SERVER_A.var
@@ -4,7 +4,7 @@
 FAI_ALLOW_UNSIGNED=0
 
 CONSOLEFONT=
-KEYMAP=us-latin1
+#KEYMAP=us-latin1
 
 # Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not.
 UTC=yes
@@ -16,9 +16,10 @@ USERNAME=""
 
 # Use: 'mkpasswd -Hsha-256 <PASSWORD>' to create the password hash
 # pw is "fai":
-#ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
+ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
+ADMINPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 # If $ROOTPW is empty, you will be prompted during installation:
-ROOTPW=''
+#ROOTPW=''
 
 ## All sensible data will end up here (see below):
 DATADIR=/root/installation/
@@ -40,8 +41,13 @@ GATEWAY="10.0.0.1"
 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 [ "$MAINSERVER" ] ; then 
+    if [ "$MAINSERVER" = "COMBINED" ] ; then
+        MAINSERVER_IPADDR=$GATEWAY
+    fi
+else 
+#  if [ "$GATEWAY" != "$MAINSERVER_IPADDR" ] && \
+if [ "$FAI_ACTION" == "install" ] || [ "$CONVERT" == "true" ] ; then
     ## Dialog to choose setup:
     inp=$(dialog --insecure --stdout --backtitle " Network Setup " --radiolist \
         "There are two variants available:\n\n\
@@ -56,13 +62,14 @@ if [ "$GATEWAY" != "$MAINSERVER_IPADDR" ] && \
     fi
     unset inp
 fi
+fi
 
 SUBNET="10.0.0.0"
 NETMASK="255.255.0.0"
 SUBNETMASK="10.0.0.0/16"
 
 ## NETMASK for FAI config space access:
-FAINETMASK="10.0.0.0/24"
+FAINETMASK="10.0.0.0/16"
 
 ## DHCP range for unknown clients (cf. dhcpd.conf):
 RANGE="10.0.1.10 10.0.1.200"
@@ -83,7 +90,7 @@ APT_URL="http://www.intern/debian/"
 # 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"
+# 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