[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. a22de7f6b1384e62c3ead45537497a21d1a3ef06
Andreas B. Mundt
andi.mundt at web.de
Tue Jan 17 19:18:15 UTC 2012
The following commit has been merged in the master branch:
commit a22de7f6b1384e62c3ead45537497a21d1a3ef06
Author: Andreas B. Mundt <andi.mundt at web.de>
Date: Tue Jan 17 20:10:37 2012 +0100
Experimental diskless client implementation. See Wiki for
instructions on how to install and use. ToDo: swap space.
Minor fixes and modifications:
* Keep most FAI-upstream parts in grub.cfg.
* Use FAI classes for partitioning schemes.
diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 9113d62..ebd2620 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -7,10 +7,10 @@
# all setup-specific details.
## Setup A, a minimalistic setup:
-MAINSERVER_A="LOG_SERVER PROXY NTP_SERVER DNS_SERVER NFS_SERVER LDAP_CLIENT \
-LDAP_SERVER KERBEROS_CLIENT KERBEROS_KDC KDC_LDAP SERVER_A"
+MAINSERVER_A="LVM6_A LOG_SERVER PROXY NTP_SERVER DNS_SERVER NFS_SERVER \
+LDAP_CLIENT LDAP_SERVER KERBEROS_CLIENT KERBEROS_KDC KDC_LDAP SERVER_A"
-WORKSTATION_A="LOG_CLIENT LDAP_CLIENT NFS_CLIENT KERBEROS_CLIENT CLIENT_A"
+WORKSTATION_A="LVM5_A LOG_CLIENT LDAP_CLIENT NFS_CLIENT KERBEROS_CLIENT CLIENT_A"
## Setup B, not yet implemented:
@@ -38,6 +38,10 @@ case $HOSTNAME in
## You might want to add some localization class like:
# echo "FAIBASE DHCPC $WORKSTATION_A XORG DESKTOP GERMAN" ;;
echo "FAIBASE DHCPC $WORKSTATION_A XORG DESKTOP" ;;
+ diskless)
+ echo "$WORKSTATION_A XORG DISKLESS"
+ ## skip GRUB_PC below:
+ exit 0 ;;
*)
echo "FAIBASE DHCPC" ;;
esac
diff --git a/fai/config/debconf/FAIBASE b/fai/config/debconf/DISKLESS
similarity index 100%
copy from fai/config/debconf/FAIBASE
copy to fai/config/debconf/DISKLESS
diff --git a/fai/config/disk_config/CLIENT_A b/fai/config/disk_config/LVM5_A
similarity index 100%
rename from fai/config/disk_config/CLIENT_A
rename to fai/config/disk_config/LVM5_A
diff --git a/fai/config/disk_config/SERVER_A b/fai/config/disk_config/LVM6_A
similarity index 100%
copy from fai/config/disk_config/SERVER_A
copy to fai/config/disk_config/LVM6_A
diff --git a/fai/config/disk_config/SERVER_A b/fai/config/disk_config/LVM7_A
similarity index 89%
rename from fai/config/disk_config/SERVER_A
rename to fai/config/disk_config/LVM7_A
index 9f899de..851939e 100644
--- a/fai/config/disk_config/SERVER_A
+++ b/fai/config/disk_config/LVM7_A
@@ -8,4 +8,5 @@ vg vg_system disk1.5
vg_system-root / 1G-2G ext3 errors=remount-ro
vg_system-usr /usr 2G-20G ext3 defaults
vg_system-var /var 1G-20G ext3 defaults
+vg_system-opt /opt 4G-10G ext3 defaults
vg_system-home /lan/mainserver/home0 2G- ext3 defaults
diff --git a/fai/config/files/etc/fai/grub.cfg/SERVER_A b/fai/config/files/etc/fai/grub.cfg/SERVER_A
index f0bf3bd..5e8a34d 100644
--- a/fai/config/files/etc/fai/grub.cfg/SERVER_A
+++ b/fai/config/files/etc/fai/grub.cfg/SERVER_A
@@ -58,27 +58,33 @@ menuentry "Fully Automatic Installation - workstation00" {
initrd /boot/initrd.img
}
-menuentry "Fully Automatic Installation - workstation01" {
+menuentry "Debian LAN rescue system, no installation" {
set gfxpayload=1024x768
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=workstation01
- initrd /boot/initrd.img
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=10.0.1.100:::::eth0:off hostname=demohost
+ initrd /boot/initrd.img
}
-menuentry "Fully Automatic Installation - workstation02" {
+menuentry "Fully Automatic Installation - demohost (pw: installme)" {
set gfxpayload=1024x768
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=workstation02
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=demohost
initrd /boot/initrd.img
}
-menuentry "Fully Automatic Installation - workstation03" {
+menuentry "Fully Automatic Installation with GNOME (pw: installme)" {
set gfxpayload=1024x768
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=workstation03
- initrd /boot/initrd.img
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=gnomehost
+ initrd /boot/initrd.img
+}
+
+menuentry "Fully Automatic Installation - faiserver (pw: installme)" {
+ set gfxpayload=1024x768
+ linux /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
+ initrd /boot/initrd.img
}
menuentry "FAI rescue system, no installation" {
set gfxpayload=1024x768
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=10.0.1.100:::::eth0:off hostname=demohost
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.1.1:::::eth0:off hostname=demohost
initrd /boot/initrd.img
}
@@ -86,4 +92,3 @@ menuentry "Boot OS of first partition on first disk" {
set root=(hd0,1)
chainloader +1
}
-
diff --git a/fai/config/files/etc/hosts/mainserver b/fai/config/files/etc/hosts/diskless
similarity index 83%
copy from fai/config/files/etc/hosts/mainserver
copy to fai/config/files/etc/hosts/diskless
index cdcebcf..85f763b 100644
--- a/fai/config/files/etc/hosts/mainserver
+++ b/fai/config/files/etc/hosts/diskless
@@ -1,5 +1,5 @@
127.0.0.1 localhost
-127.0.1.1 mainserver.intern mainserver
+127.0.1.1 host.intern host
# The following lines are desirable for IPv6 capable hosts
::1 ip6-localhost ip6-loopback
diff --git a/fai/config/files/etc/resolv.conf/DISKLESS b/fai/config/files/etc/resolv.conf/DISKLESS
new file mode 100644
index 0000000..71a6b67
--- /dev/null
+++ b/fai/config/files/etc/resolv.conf/DISKLESS
@@ -0,0 +1,2 @@
+nameserver 10.0.0.1
+search intern
diff --git a/fai/config/package_config/DISKLESS b/fai/config/package_config/DISKLESS
new file mode 100644
index 0000000..189365c
--- /dev/null
+++ b/fai/config/package_config/DISKLESS
@@ -0,0 +1,45 @@
+PACKAGES aptitude
+## FIXME: needed because the pxe kernel is 486
+linux-image-486
+
+lxde
+lxtask
+desktop-base
+
+gnome-session
+gnome-applets
+#gnome-desktop-environment
+#gnome
+
+gdm3
+menu
+#arduino
+eog
+evince
+gcalctool
+gnome-screenshot
+iceweasel
+inkscape
+gimp
+openoffice.org # FIXME libreoffice
+krb5-auth-dialog
+
+## From FAIBASE:
+fai-client
+cfengine2
+debconf-utils
+file
+less
+nfs-common
+nscd
+rsync
+openssh-client
+strace
+time
+procinfo
+exim4
+eject
+locales
+console-common
+pciutils usbutils
+bsd-mailx
diff --git a/fai/config/scripts/DISKLESS/10-misc b/fai/config/scripts/DISKLESS/10-misc
new file mode 100755
index 0000000..3d53501
--- /dev/null
+++ b/fai/config/scripts/DISKLESS/10-misc
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+fcopy -v /etc/resolv.conf
+fcopy -v /etc/hosts
+
+## FIXME remove this as soon as not needed anymore:
+# set root password
+#echo "root:$ROOTPW" | $ROOTCMD chpasswd --encrypted
+$ROOTCMD usermod -p "$ROOTPW" root
+# make /root accessible only by root
+chmod 0700 $target/root
+chown root:root $target/root
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list