[debian-lan-devel] [debian-lan] 01/03: Merge FAI 4.2, no non-free firmware.
Andreas B. Mundt
andi at moszumanska.debian.org
Sun Jun 8 07:17:34 UTC 2014
This is an automated email from the git hooks/post-receive script.
andi pushed a commit to branch master
in repository debian-lan.
commit 3fe52a543bb6bf3d32fa193dbb2c0162bd5bf436
Author: Andreas B. Mundt <andi at debian.org>
Date: Fri Jun 6 10:53:30 2014 +0200
Merge FAI 4.2, no non-free firmware.
Update the installation README for jessie and merge FAI 4.2 changes.
Try to avoid non-free firmware by default.
---
debian/README.Debian | 25 ++++++++++++++-----------
fai/config/files/etc/fai/NFSROOT/FAISERVER | 4 ++--
fai/config/files/etc/fai/grub.cfg/SERVER_A | 29 ++++++++++++-----------------
fai/config/hooks/savelog.LAST.source | 2 ++
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index db01f98..92a4d7d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,4 +1,4 @@
-The Debian Package debian-lan-config
+The Debian package debian-lan-config
====================================
This package contains the FAI config space for the Debian-LAN system.
@@ -20,27 +20,30 @@ Creating a CD image with fai-cd
Create the CD image in the following way:
aptitude install debian-lan-config # might be already installed
- aptitude -R install fai-server genisoimage # no recommends needed
+ aptitude -R install fai-server xorriso # no recommends needed
mkdir /srv/fai/
cp -r /usr/share/debian-lan-config/fai/config /srv/fai/
- cp /srv/fai/config/files/etc/fai/grub.cfg/SERVER_A /etc/fai/grub.cfg
- cp /srv/fai/config/files/etc/fai/NFSROOT/FAISERVER /etc/fai/NFSROOT
- sed -i "s/^deb.*fai-project/\#&/" /etc/fai/apt/sources.list
+ cp -b /srv/fai/config/files/etc/fai/grub.cfg/SERVER_A /etc/fai/grub.cfg
+ cp -b /srv/fai/config/files/etc/fai/NFSROOT/FAISERVER /etc/fai/NFSROOT
+ cp -b /srv/fai/config/files/etc/fai/nfsroot.conf/SERVER_A /etc/fai/nfsroot.conf
+ cp -b /srv/fai/config/files/etc/fai/apt/sources.list/SERVER_A /etc/fai/apt/sources.list
+
+Use live-boot for the fai-cd:
+
+ sed -i -r -e "s/^(dracut.*$)/\#\1/" /etc/fai/NFSROOT
+ sed -i -r -e "s/^\#live-boot.*/live-boot/" /etc/fai/NFSROOT
Adapt the config space to your needs if necessary and create the FAI
nfsroot:
fai-make-nfsroot -v -l
-Now create a fake Debian mirror needed to satisfy fai-cd. The CD image
-is then created by fai-cd:
+The CD image is then created by fai-cd:
- mkdir -p /tmp/debmirror/dists/fake/main/binary-i386/
- touch /tmp/debmirror/dists/fake/main/binary-i386/Packages
- fai-cd -m /tmp/debmirror/ fai-cd.iso
+ fai-cd -M fai-cd.iso
-Converting a minimal Debian Installation
+Converting a minimal Debian installation
----------------------------------------
Install a minimal Debian (only the core system) on the server. Choose
diff --git a/fai/config/files/etc/fai/NFSROOT/FAISERVER b/fai/config/files/etc/fai/NFSROOT/FAISERVER
index 996ebb2..de24c5b 100644
--- a/fai/config/files/etc/fai/NFSROOT/FAISERVER
+++ b/fai/config/files/etc/fai/NFSROOT/FAISERVER
@@ -6,7 +6,7 @@ rsync lftp less dump reiserfsprogs e2fsprogs usbutils
hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
dnsutils ntpdate dosfstools xfsprogs xfsdump
procinfo numactl dialog
-console-tools console-common
+console-tools console-common kbd
iproute moreutils udev subversion
xz-utils
cupt
@@ -16,7 +16,7 @@ cfengine2
whois
# some network cards needs firmware
-firmware-bnx2 firmware-bnx2x firmware-realtek
+#firmware-bnx2 firmware-bnx2x firmware-realtek
# dracut can replace live-boot
dracut-network live-boot- live-boot-initramfs-tools-
diff --git a/fai/config/files/etc/fai/grub.cfg/SERVER_A b/fai/config/files/etc/fai/grub.cfg/SERVER_A
index 4bf0fd9..b0507e8 100644
--- a/fai/config/files/etc/fai/grub.cfg/SERVER_A
+++ b/fai/config/files/etc/fai/grub.cfg/SERVER_A
@@ -1,6 +1,7 @@
## grub2 configuration
set default=" Boot OS of first partition on first disk"
set timeout=20
+set resolution=1024x768
if loadfont /boot/grub/ascii.pf2 ; then
insmod png
@@ -30,45 +31,39 @@ fi
menuentry "" {
- set gfxpayload=1024x768
- linux /boot/vmlinuz boot=live
+ set gfxpayload=$resolution
}
menuentry " FAI-CD (c) Thomas Lange, lange at debian.org" {
- set gfxpayload=1024x768
- linux /boot/vmlinuz boot=live
+ set gfxpayload=$resolution
}
menuentry " _VERSIONSTRING_ " {
- set gfxpayload=1024x768
- linux /boot/vmlinuz boot=live
+ set gfxpayload=$resolution
}
menuentry "" {
- set gfxpayload=1024x768
- linux /boot/vmlinuz boot=live
+ set gfxpayload=$resolution
}
-
menuentry "" {
- set gfxpayload=1024x768
- linux /boot/vmlinuz boot=live
+ set gfxpayload=$resolution
}
menuentry " Fully Automatic Installation - Debian-LAN: mainserver" {
- set gfxpayload=1024x768
+ set gfxpayload=$resolution
set root=(cd)
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=mainserver
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=mainserver FAI_CONFIG_SRC=file:///var/lib/fai/config
initrd /boot/initrd.img
}
menuentry " Fully Automatic Installation - Debian-LAN: gateway" {
- set gfxpayload=1024x768
+ set gfxpayload=$resolution
set root=(cd)
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=gateway
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=gateway FAI_CONFIG_SRC=file:///var/lib/fai/config
initrd /boot/initrd.img
}
menuentry " FAI - System Information" {
- set gfxpayload=1024x768
+ set gfxpayload=$resolution
set root=(cd)
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=mainserver
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=mainserver FAI_CONFIG_SRC=file:///var/lib/fai/config
initrd /boot/initrd.img
}
diff --git a/fai/config/hooks/savelog.LAST.source b/fai/config/hooks/savelog.LAST.source
index 8a19ca2..b873daa 100755
--- a/fai/config/hooks/savelog.LAST.source
+++ b/fai/config/hooks/savelog.LAST.source
@@ -124,6 +124,8 @@ Dummy start-stop-daemon called
X: bytes packets errors
ACPI Error
ACPI Warning
+AE_NOT_FOUND
+conflicts with ACPI region
cannot stat \`/etc/modprobe.d/\*.conf'
cdrom: open failed.
libgpg-error
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git
More information about the debian-lan-devel
mailing list