[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 56dfb4e346108acb07e4c14d3235231da25f9785
Andreas B. Mundt
andi.mundt at web.de
Thu Feb 2 21:12:54 UTC 2012
The following commit has been merged in the master branch:
commit 56dfb4e346108acb07e4c14d3235231da25f9785
Author: Andreas B. Mundt <andi.mundt at web.de>
Date: Thu Feb 2 22:09:07 2012 +0100
Minor fixes and improvements.
Revert part of 611dfa9cce94253c, it is not needed on the clients.
diff --git a/fai/config/package_config/DEVTOOLS b/fai/config/package_config/DEVTOOLS
index 76782f3..6e1730b 100644
--- a/fai/config/package_config/DEVTOOLS
+++ b/fai/config/package_config/DEVTOOLS
@@ -1,8 +1,9 @@
## Optional packages for development.
-PACKAGES aptitude
+PACKAGES aptitude-r
## General purpose:
emacs
git
+gitk
## Diagnostics:
gbd
@@ -10,5 +11,9 @@ lsof
ltrace
nmap
+## Documentation
+#texlive
+#auctex
+
## LDAP:
ldap-utils
diff --git a/fai/config/scripts/DISKLESS_CLIENT/20-server b/fai/config/scripts/DISKLESS_CLIENT/20-server
index 50c2994..5eeb7ac 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/20-server
+++ b/fai/config/scripts/DISKLESS_CLIENT/20-server
@@ -5,14 +5,15 @@
set -e
-TEMPLATE=/srv/tftp/fai/pxelinux.cfg/diskless.tmpl
+if [ $FAI_ACTION == "install" ] ; then
+ TEMPLATE=/srv/tftp/fai/pxelinux.cfg/diskless.tmpl
-if [ ! -e $TEMPLATE ]; then
- KERNEL=`basename $(ls /srv/tftp/fai/vmlinuz*)`
- INITRD=`basename $(ls /srv/tftp/fai/initrd.img*)`
+ if [ ! -e $TEMPLATE ]; then
+ KERNEL=`basename $(ls /srv/tftp/fai/vmlinuz*)`
+ INITRD=`basename $(ls /srv/tftp/fai/initrd.img*)`
- echo "Creating template with $KERNEL and $INITRD."
- cat > $TEMPLATE <<EOF
+ echo "Creating template with $KERNEL and $INITRD."
+ cat > $TEMPLATE <<EOF
# template for diskless
default fai-generated
@@ -20,9 +21,9 @@ label fai-generated
kernel $KERNEL
append initrd=$INITRD ip=dhcp root=/dev/nfs nfsroot=/opt boot=live
EOF
-else
+ else
- echo "The template $TEMPLATE exists already!"
+ echo "The template $TEMPLATE exists already!"
+ fi
+ fai-chboot -vc diskless default
fi
-
-fai-chboot -vc diskless default
diff --git a/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak b/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak
index 46d50e6..b026251 100755
--- a/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak
+++ b/fai/config/scripts/NFS_CLIENT/10-krb5.conf-tweak
@@ -12,6 +12,5 @@ editfiles:
BeginGroupIfNoSuchLine ' allow_weak_crypto = true'
LocateLineMatching '.*\[libdefaults\].*'
InsertLine ' allow_weak_crypto = true'
- InsertLine ' permitted_enctypes = des-cbc-crc'
EndGroup
}
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list