[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-24-g3b1368a
Andreas B. Mundt
andi at debian.org
Mon Aug 20 09:10:42 UTC 2012
The following commit has been merged in the master branch:
commit 593bedb8fa70f6d16cd3fea5618da699a49f6784
Author: Andreas B. Mundt <andi at debian.org>
Date: Sat Aug 18 08:36:44 2012 +0200
Various small fixes and cleanups.
* grub.cfg: sync with version provided by FAI and make it work
* strong encryption in krb5.conf
* automounts with sec=krb5i by default
* update kernel (meta-)packages and install recommends (firmware)
* packages: grub-pc for the FAISERVER
* left-over "$target" in ainsl
* sudoers in nsswitch.conf: fixed in Debian package
* 10-slapd-KDC: not an error, just a notice.
diff --git a/fai/config/files/etc/fai/grub.cfg/SERVER_A b/fai/config/files/etc/fai/grub.cfg/SERVER_A
index 5e8a34d..09f9634 100644
--- a/fai/config/files/etc/fai/grub.cfg/SERVER_A
+++ b/fai/config/files/etc/fai/grub.cfg/SERVER_A
@@ -1,5 +1,5 @@
## grub2 configuration
-set default=4
+set default="Boot OS of first partition on first disk"
set timeout=20
if loadfont /boot/grub/ascii.pf2 ; then
@@ -48,43 +48,50 @@ menuentry "+------------------------------------------------------+" {
menuentry "Fully Automatic Installation - mainserver" {
set gfxpayload=1024x768
+ set root=(cd)
linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=mainserver
initrd /boot/initrd.img
}
menuentry "Fully Automatic Installation - workstation00" {
set gfxpayload=1024x768
+ set root=(cd)
linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=workstation00
initrd /boot/initrd.img
}
-menuentry "Debian LAN rescue system, no installation" {
+menuentry "Fully Automatic Installation - demohost" {
set gfxpayload=1024x768
- 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
+ set root=(cd)
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=demohost
+ initrd /boot/initrd.img
}
-menuentry "Fully Automatic Installation - demohost (pw: installme)" {
+menuentry "Fully Automatic Installation with XFCE" {
set gfxpayload=1024x768
- 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
+ set root=(cd)
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=xfcehost
+ initrd /boot/initrd.img
}
-menuentry "Fully Automatic Installation with GNOME (pw: installme)" {
+menuentry "Fully Automatic Installation with GNOME" {
set gfxpayload=1024x768
- linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=gnomehost
+ set root=(cd)
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=gnomehost
initrd /boot/initrd.img
}
-menuentry "Fully Automatic Installation - faiserver (pw: installme)" {
+menuentry "Fully Automatic Installation - faiserver" {
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
+ set root=(cd)
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install 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=192.168.1.1:::::eth0:off hostname=demohost
+ set root=(cd)
+ linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=demohost
initrd /boot/initrd.img
}
diff --git a/fai/config/files/etc/krb5.conf/KDC_LDAP b/fai/config/files/etc/krb5.conf/KDC_LDAP
index 2f1337d..fc205c1 100644
--- a/fai/config/files/etc/krb5.conf/KDC_LDAP
+++ b/fai/config/files/etc/krb5.conf/KDC_LDAP
@@ -1,7 +1,4 @@
[libdefaults]
- ## FIXME: needed because of #521878:
- allow_weak_crypto = true
- permitted_enctypes = des-cbc-crc
default_realm = INTERN
[realms]
diff --git a/fai/config/files/etc/ldap/autofs.ldif/SERVER_A b/fai/config/files/etc/ldap/autofs.ldif/SERVER_A
index f14ac4e..bcbc686 100644
--- a/fai/config/files/etc/ldap/autofs.ldif/SERVER_A
+++ b/fai/config/files/etc/ldap/autofs.ldif/SERVER_A
@@ -39,4 +39,4 @@ ou: auto.mainserver
dn: cn=/,ou=auto.mainserver,ou=automount,dc=intern
objectClass: automount
cn: /
-automountInformation: -fstype=nfs4,sec=sys,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid mainserver.intern:/&
+automountInformation: -fstype=nfs4,sec=krb5i,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid mainserver.intern:/&
diff --git a/fai/config/package_config/DEBIAN b/fai/config/package_config/DEBIAN
index 5078ab1..09a3a5e 100644
--- a/fai/config/package_config/DEBIAN
+++ b/fai/config/package_config/DEBIAN
@@ -1,13 +1,13 @@
-PACKAGES aptitude I386
-linux-image-2.6-686 initramfs-tools
+PACKAGES aptitude-r I386
+linux-image-686-pae initramfs-tools
memtest86+
PACKAGES aptitude CHROOT
-linux-image-686-
+linux-image-686-pae-
linux-image-amd64-
-PACKAGES aptitude AMD64
-linux-image-2.6-amd64 initramfs-tools
+PACKAGES aptitude-r AMD64
+linux-image-amd64 initramfs-tools
memtest86+
PACKAGES aptitude XEN
diff --git a/fai/config/package_config/FAISERVER b/fai/config/package_config/FAISERVER
index 3e1baa3..543b574 100644
--- a/fai/config/package_config/FAISERVER
+++ b/fai/config/package_config/FAISERVER
@@ -4,7 +4,7 @@ fai-quickstart
isc-dhcp-client
debmirror tcpdump
apache2
-genisoimage grub
+genisoimage grub-pc
lftp
syslinux-common
diff --git a/fai/config/scripts/CLIENT_A/30-APTrepository b/fai/config/scripts/CLIENT_A/30-APTrepository
index a30a473..b1f2bd5 100755
--- a/fai/config/scripts/CLIENT_A/30-APTrepository
+++ b/fai/config/scripts/CLIENT_A/30-APTrepository
@@ -14,7 +14,7 @@ if $ROOTCMD wget -O /tmp/DebianLAN.pubkey $APT_URL/DebianLAN.pubkey ; then
echo -n "Run apt-key and add key: "
$ROOTCMD apt-key add /tmp/DebianLAN.pubkey
## Key is available, add repository to sources.list.d/.
- FILE=$target/etc/apt/sources.list.d/local.list
+ FILE=/etc/apt/sources.list.d/local.list
ainsl -a $FILE "## Local APT repository for site-specific packages:"
ainsl $FILE "deb $APT_URL stable main"
else
diff --git a/fai/config/scripts/KDC_LDAP/10-slapd-KDC b/fai/config/scripts/KDC_LDAP/10-slapd-KDC
index b7598a9..90359ee 100755
--- a/fai/config/scripts/KDC_LDAP/10-slapd-KDC
+++ b/fai/config/scripts/KDC_LDAP/10-slapd-KDC
@@ -171,8 +171,8 @@ start_slapd () {
$ROOTCMD cp -v /sbin/start-stop-daemon.distrib /sbin/start-stop-daemon
start_stop_daemon_moved=true
else
- echo "Error: No start-stop-daemon.distrib available. "
- echo "'ls /sbin/start-stop-daemon*' gives: "
+ echo "No start-stop-daemon.distrib available. "
+ echo "'ls /sbin/start-stop-daemon*' returns: "
$ROOTCMD ls /sbin/start-stop-daemon*
fi
$ROOTCMD /etc/init.d/slapd start
diff --git a/fai/config/scripts/LDAP_CLIENT/40-nsswitch.conf b/fai/config/scripts/LDAP_CLIENT/40-nsswitch.conf
index 53b732f..5136995 100755
--- a/fai/config/scripts/LDAP_CLIENT/40-nsswitch.conf
+++ b/fai/config/scripts/LDAP_CLIENT/40-nsswitch.conf
@@ -1,6 +1,6 @@
#!/usr/sbin/cfagent -f
-## FIXME: #639530 #639529
+## FIXME: #639529
control:
any::
@@ -9,7 +9,6 @@ control:
editfiles:
any::
- { ${target}/etc/nsswitch.conf
+ { ${target}/etc/nsswitch.conf
AppendIfNoSuchLine "automount: files ldap"
- AppendIfNoSuchLine "sudoers: files ldap"
}
diff --git a/fai/config/scripts/NFS_SERVER/10-config b/fai/config/scripts/NFS_SERVER/10-config
index ada5257..ec2b301 100755
--- a/fai/config/scripts/NFS_SERVER/10-config
+++ b/fai/config/scripts/NFS_SERVER/10-config
@@ -26,8 +26,8 @@ editfiles:
{ ${target}/etc/exports
## kerberized NFS4:
- AppendIfNoSuchLine "/srv/nfs4 ${SUBNETMASK}(sec=krb5p:krb5i:sys,rw,sync,fsid=0,crossmnt,no_subtree_check)"
- AppendIfNoSuchLine "/srv/nfs4/home0 ${SUBNETMASK}(sec=krb5p:krb5i:sys,rw,sync,no_subtree_check)"
+ AppendIfNoSuchLine "/srv/nfs4 ${SUBNETMASK}(sec=krb5p:krb5i,rw,sync,fsid=0,crossmnt,no_subtree_check)"
+ AppendIfNoSuchLine "/srv/nfs4/home0 ${SUBNETMASK}(sec=krb5p:krb5i,rw,sync,no_subtree_check)"
}
{ ${target}/etc/fstab
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list