[Fai-commit] r5939 - in trunk: conf debian examples/simple/files/etc/apache2/conf.d examples/simple/files/etc/dhcp3/dhcpd.conf examples/simple/files/etc/fai/make-fai-nfsroot.conf examples/simple/files/etc/fai/menu.lst examples/simple/files/etc/rc2.d/S99fai-setup examples/simple/scripts/FAISERVER
Thomas Lange
lange at alioth.debian.org
Wed Aug 4 04:07:31 UTC 2010
Author: lange
Date: 2010-08-04 04:07:28 +0000 (Wed, 04 Aug 2010)
New Revision: 5939
Modified:
trunk/conf/menu.lst
trunk/debian/changelog
trunk/examples/simple/files/etc/apache2/conf.d/FAISERVER
trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER
trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
trunk/examples/simple/files/etc/fai/menu.lst/FAISERVER
trunk/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER
trunk/examples/simple/scripts/FAISERVER/10-conffiles
Log:
* use 192.168.33.0/24 subnet for class FAISERVER
* S99fai-setup: do not call fai-setup
Modified: trunk/conf/menu.lst
===================================================================
--- trunk/conf/menu.lst 2010-08-04 03:31:59 UTC (rev 5938)
+++ trunk/conf/menu.lst 2010-08-04 04:07:28 UTC (rev 5939)
@@ -26,19 +26,19 @@
title Fully Automatic Installation - demohost (pw: installme)
password installme
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=demohost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.33.1:::::eth0:off hostname=demohost
initrd /boot/initrd.img
title Fully Automatic Installation with GNOME (pw: installme)
password installme
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=gnomehost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.33.1:::::eth0:off hostname=gnomehost
initrd /boot/initrd.img
title Fully Automatic Installation - faiserver (pw: installme)
password installme
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.250::192.168.1.254:255.255.255.0::xxx:off hostname=faiserver
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.33.250::192.168.33.254:255.255.255.0::xxx:off hostname=faiserver
initrd /boot/initrd.img
title FAI rescue system, no installation
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.1.1:::::eth0:off hostname=demohost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.33.1:::::eth0:off hostname=demohost
initrd /boot/initrd.img
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2010-08-04 03:31:59 UTC (rev 5938)
+++ trunk/debian/changelog 2010-08-04 04:07:28 UTC (rev 5939)
@@ -111,6 +111,8 @@
(Thanks to Michael Goetze for the patch)
* THANKS: add Michael
* remove apt-proxy
+ * use 192.168.33.0/24 subnet for class FAISERVER
+ * S99fai-setup: do not call fai-setup
[ Michael Tautschnig ]
* setup-storage: Bumped version number to 1.3
Modified: trunk/examples/simple/files/etc/apache2/conf.d/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/apache2/conf.d/FAISERVER 2010-08-04 03:31:59 UTC (rev 5938)
+++ trunk/examples/simple/files/etc/apache2/conf.d/FAISERVER 2010-08-04 04:07:28 UTC (rev 5939)
@@ -3,14 +3,13 @@
Options None
Order deny,allow
Deny from all
- Allow from 192.168.1
+ Allow from 192.168.33
</Directory>
<Directory "/var/www/debian">
AllowOverride None
Options None
Order deny,allow
-# Deny from all
Allow from all
</Directory>
@@ -18,7 +17,6 @@
AllowOverride None
Options None
Order deny,allow
-# Deny from all
Allow from all
</Directory>
Modified: trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER 2010-08-04 03:31:59 UTC (rev 5938)
+++ trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER 2010-08-04 04:07:28 UTC (rev 5939)
@@ -1,24 +1,26 @@
-# dhcpd.conf for a fai install server
-# replace faiserver with the name of your install server
+# dhcpd.conf for a fai installation server
deny unknown-clients;
option dhcp-max-message-size 2048;
use-host-decl-names on;
#always-reply-rfc1048 on;
-subnet 192.168.1.0 netmask 255.255.255.0 {
- option routers 192.168.1.250;
+subnet 192.168.33.0 netmask 255.255.255.0 {
+ option routers 192.168.33.250;
option domain-name "fai";
- option domain-name-servers 192.168.1.250;
+ option domain-name-servers 192.168.33.250;
option time-servers faiserver;
- option ntp-servers faiserver;
+# option ntp-servers faiserver;
server-name faiserver;
next-server faiserver;
filename "fai/pxelinux.0";
+ pool {
+ range 192.168.33.10 192.168.33.100;
+ allow unknown-clients;
+ }
}
# generate more lines with:
-
# perl -e 'for (1..25) {printf "host atom%02s {hardware ethernet XXX:$_;fixed-address atom%02s;}\n",$_,$_;}'
# replace 1:2:3:4:5:XX with the hardware addresses of your clients
@@ -32,18 +34,3 @@
host atom08 {hardware ethernet 1:2:3:4:5:8;fixed-address atom08;}
host atom09 {hardware ethernet 1:2:3:4:5:9;fixed-address atom09;}
host atom10 {hardware ethernet 1:2:3:4:5:10;fixed-address atom10;}
-host atom11 {hardware ethernet 1:2:3:4:5:11;fixed-address atom11;}
-host atom12 {hardware ethernet 1:2:3:4:5:12;fixed-address atom12;}
-host atom13 {hardware ethernet 1:2:3:4:5:13;fixed-address atom13;}
-host atom14 {hardware ethernet 1:2:3:4:5:14;fixed-address atom14;}
-host atom15 {hardware ethernet 1:2:3:4:5:15;fixed-address atom15;}
-host atom16 {hardware ethernet 1:2:3:4:5:16;fixed-address atom16;}
-host atom17 {hardware ethernet 1:2:3:4:5:17;fixed-address atom17;}
-host atom18 {hardware ethernet 1:2:3:4:5:18;fixed-address atom18;}
-host atom19 {hardware ethernet 1:2:3:4:5:19;fixed-address atom19;}
-host atom20 {hardware ethernet 1:2:3:4:5:20;fixed-address atom20;}
-host atom21 {hardware ethernet 1:2:3:4:5:21;fixed-address atom21;}
-host atom22 {hardware ethernet 1:2:3:4:5:22;fixed-address atom22;}
-host atom23 {hardware ethernet 1:2:3:4:5:23;fixed-address atom23;}
-host atom24 {hardware ethernet 1:2:3:4:5:24;fixed-address atom24;}
-host atom25 {hardware ethernet 1:2:3:4:5:25;fixed-address atom25;}
Modified: trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER 2010-08-04 03:31:59 UTC (rev 5938)
+++ trunk/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER 2010-08-04 04:07:28 UTC (rev 5939)
@@ -13,7 +13,7 @@
# Add a line for mirrorhost and installserver when DNS is not available
# on the clients. This line(s) will be added to $nfsroot/etc/hosts.
-NFSROOT_ETC_HOSTS="192.168.1.250 faiserver"
+NFSROOT_ETC_HOSTS="192.168.33.250 faiserver"
# Parameter for debootstrap: "<suite> <mirror>"
FAI_DEBOOTSTRAP="lenny http://faiserver/debian"
Modified: trunk/examples/simple/files/etc/fai/menu.lst/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/fai/menu.lst/FAISERVER 2010-08-04 03:31:59 UTC (rev 5938)
+++ trunk/examples/simple/files/etc/fai/menu.lst/FAISERVER 2010-08-04 04:07:28 UTC (rev 5939)
@@ -26,19 +26,19 @@
title Fully Automatic Installation - demohost (pw: installme)
password installme
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=demohost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.33.1:::::eth0:off hostname=demohost
initrd /boot/initrd.img
title Fully Automatic Installation with GNOME (pw: installme)
password installme
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=gnomehost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.33.1:::::eth0:off hostname=gnomehost
initrd /boot/initrd.img
title Fully Automatic Installation - faiserver (pw: installme)
password installme
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.250::192.168.1.254:255.255.255.0::xxx:off hostname=faiserver
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.33.250::192.168.33.254:255.255.255.0::xxx:off hostname=faiserver
initrd /boot/initrd.img
title FAI rescue system, no installation
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.1.1:::::eth0:off hostname=demohost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.33.1:::::eth0:off hostname=demohost
initrd /boot/initrd.img
Modified: trunk/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER 2010-08-04 03:31:59 UTC (rev 5938)
+++ trunk/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER 2010-08-04 04:07:28 UTC (rev 5939)
@@ -14,16 +14,17 @@
# setup network
dhclient eth0 # connection to the outside world (hopefully)
-ip addr add 192.168.1.250 dev eth0 # (fixed address of faiserver)
+ip addr add 192.168.33.250 dev eth0 # (fixed address of faiserver)
/etc/init.d/nscd restart
/etc/init.d/apache2 restart
-fai-setup -v 2>&1 | tee /var/log/fai-setup.log
+# do not call fai-setup currently
+echo 'Please call fai-setup -v 2>&1 | tee /var/log/fai-setup.log'
# create default pxelinux boot configuration (boot from local disk)
fai-chboot -o default
-echo "Log files are saved to /var/log/fai-setup.log"
+#echo "Log files are saved to /var/log/fai-setup.log"
# remove me
rm $0
Modified: trunk/examples/simple/scripts/FAISERVER/10-conffiles
===================================================================
--- trunk/examples/simple/scripts/FAISERVER/10-conffiles 2010-08-04 03:31:59 UTC (rev 5938)
+++ trunk/examples/simple/scripts/FAISERVER/10-conffiles 2010-08-04 04:07:28 UTC (rev 5939)
@@ -13,5 +13,7 @@
rm -f $target/etc/resolv.conf
# create some host entries
- perl -e 'for (1..25) {printf "192.168.1.%s atom%02s\n",$_,$_;}' >> $target/etc/hosts
+ ainsl $target/etc/hosts "192.168.33.1 demohost"
+ ainsl $target/etc/hosts "192.168.33.2 gnomehost"
+# perl -e 'for (3..9) {printf "192.168.33.%s atom%02s\n",$_,$_;}' >> $target/etc/hosts
fi
More information about the Fai-commit
mailing list