[Fai-commit] r5610 - in trunk: debian examples/simple/disk_config examples/simple/files/etc/dhcp3/dhcpd.conf examples/simple/files/etc/rc2.d/S99fai-setup examples/simple/package_config
Thomas Lange
lange at alioth.debian.org
Wed Oct 28 10:18:27 UTC 2009
Author: lange
Date: 2009-10-28 10:18:24 +0000 (Wed, 28 Oct 2009)
New Revision: 5610
Modified:
trunk/debian/changelog
trunk/examples/simple/disk_config/FAISERVER
trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER
trunk/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER
trunk/examples/simple/package_config/FAISERVER
Log:
fix class FAISERVER
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-10-27 22:35:24 UTC (rev 5609)
+++ trunk/debian/changelog 2009-10-28 10:18:24 UTC (rev 5610)
@@ -115,6 +115,7 @@
* examples/simple/files/etc/fai/*: update to more recent config files
* Makefile: remove .svn directories in fai-doc
* debian/source/format: use source package format 3.0 (native)
+ * fix class FAISERVER
[ Michael Tautschnig ]
* setup-storage, setup-storage/Exec.pm: auto-detect a proper way to tell
Modified: trunk/examples/simple/disk_config/FAISERVER
===================================================================
--- trunk/examples/simple/disk_config/FAISERVER 2009-10-27 22:35:24 UTC (rev 5609)
+++ trunk/examples/simple/disk_config/FAISERVER 2009-10-28 10:18:24 UTC (rev 5610)
@@ -6,8 +6,8 @@
primary / 300 ext3 rw,errors=remount-ro
logical swap 200-1000 swap rw
-logical /var 600-1300 ext3 rw,nosuid,nodev createopts="-m15" tuneopts="-c 0 -i 0"
+logical /var 600-5G ext3 rw,nosuid,nodev createopts="-m15" tuneopts="-c 0 -i 0"
logical /tmp 100-1000 ext3 rw,nosuid,nodev createopts="-m 0" tuneopts="-c 0 -i 0"
logical /usr 1G-6G ext3 rw
-logical /home 100- ext3 rw,nosuid,nodev createopts="-m 1" tuneopts="-c 0 -i 0"
-logical /srv 1G-50% ext3 rw,nosuid,nodev createopts="-m 1" tuneopts="-c 0 -i 0"
+logical /home 100-40% ext3 rw,nosuid,nodev createopts="-m 1" tuneopts="-c 0 -i 0"
+logical /srv 1G-50% ext3 rw createopts="-m 1" tuneopts="-c 0 -i 0"
Modified: trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER 2009-10-27 22:35:24 UTC (rev 5609)
+++ trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER 2009-10-28 10:18:24 UTC (rev 5610)
@@ -14,7 +14,7 @@
option ntp-servers faiserver;
server-name faiserver;
next-server faiserver;
- filename "pxelinux.0";
+ filename "fai/pxelinux.0";
}
# generate more lines with:
Modified: trunk/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER 2009-10-27 22:35:24 UTC (rev 5609)
+++ trunk/examples/simple/files/etc/rc2.d/S99fai-setup/FAISERVER 2009-10-28 10:18:24 UTC (rev 5610)
@@ -5,6 +5,7 @@
echo "Creating the nfsroot for FAI."
. /etc/fai/fai.conf
+. /etc/fai/make-fai-nfsroot.conf
if [ ! -d "$FAI_CONFIGDIR/class" ]; then
mkdir -p $FAI_CONFIGDIR
Modified: trunk/examples/simple/package_config/FAISERVER
===================================================================
--- trunk/examples/simple/package_config/FAISERVER 2009-10-27 22:35:24 UTC (rev 5609)
+++ trunk/examples/simple/package_config/FAISERVER 2009-10-28 10:18:24 UTC (rev 5610)
@@ -1,10 +1,10 @@
PACKAGES aptitude
fai-quickstart
-dhcp3-client
+dhcp-client
debmirror tcpdump
apache2
-genisoimage grub
+genisoimage mkisofs grub
apt-proxy lftp
PACKAGES aptitude I386
More information about the Fai-commit
mailing list