[debian-lan-devel] [debian-lan] 03/06: Minor fixes, updates and improvements.
Andreas B. Mundt
andi at moszumanska.debian.org
Wed Aug 27 09:00:19 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 6ff56330298583f01e212183ee7929dc841199cd
Author: Andreas B. Mundt <andi at debian.org>
Date: Fri Aug 8 14:08:37 2014 +0200
Minor fixes, updates and improvements.
---
fai/config/files/etc/rc.local/FAISERVER | 12 ++++--------
fai/config/hooks/savelog.LAST.source | 3 ++-
fai/config/package_config/DESKTOP | 4 ++++
fai/config/package_config/LOG_CLIENT | 2 +-
fai/config/package_config/LOG_SERVER | 2 +-
fai/config/package_config/SERVER_A | 1 +
fai/config/scripts/DEBIAN/40-misc | 1 -
fai/config/scripts/FAIBASE/20-removable_media | 2 +-
fai/config/scripts/GRUB_PC/10-setup | 10 +++++-----
fai/config/scripts/SERVER_A/10-misc | 1 +
10 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index 35d31d3..910d960 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -27,14 +27,12 @@ check_network () {
setup_nfsroot () {
echo "Creating the nfsroot for FAI."
- trap "rc=$?; rm -rf $NFSROOT; exit $rc" ERR SIGHUP SIGINT SIGTERM
- if [ ! -d $NFSROOT ] ; then
- fai-setup -e -v
+ if [ ! -d $NFSROOT ] || [ -z "$(ls -A $NFSROOT)" ] ; then
+ fai-setup -f -e -v
else
## Update nfsroot:
fai-make-nfsroot -v -k
fi
- trap - ERR SIGHUP SIGINT SIGTERM
WS_TEMPLATE=$TFTPROOT/pxelinux.cfg/workstation.tmpl
if [ -e $WS_TEMPLATE ]; then
@@ -77,8 +75,7 @@ EOF
setup_diskless () {
export LC_ALL=C
- trap "rc=$?; rm -rf $DLROOT; exit $rc" ERR SIGHUP SIGINT SIGTERM
- if [ ! -d $DLROOT ] ; then
+ if [ ! -d $DLROOT ] || [ -z "$(ls -A $DLROOT)" ] ; then
fai -vNu diskless dirinstall $DLROOT
else
mount --bind /sys $DLROOT/sys
@@ -86,7 +83,6 @@ setup_diskless () {
chroot $DLROOT fai -vNu diskless softupdate
umount $DLROOT/sys $DLROOT/proc
fi
- trap - ERR SIGHUP SIGINT SIGTERM
DL_TEMPLATE=$TFTPROOT/pxelinux.cfg/diskless.tmpl
if [ -e $DL_TEMPLATE ]; then
@@ -189,7 +185,7 @@ fi
## are to be served. Do not change the following line:
exit 0 ##DISKLESS_SERVER##
-if [ -d $NFSROOT ] ; then
+if [ -d $NFSROOT ] && [ -n "$(ls -A $NFSROOT)" ] ; then
## Setup/update chroot for diskless machines:
cat <<EOF
================================================================================
diff --git a/fai/config/hooks/savelog.LAST.source b/fai/config/hooks/savelog.LAST.source
index 6a11dbb..8f4232d 100755
--- a/fai/config/hooks/savelog.LAST.source
+++ b/fai/config/hooks/savelog.LAST.source
@@ -165,7 +165,8 @@ Warning: you may need to reload your webservice!
/boot/grub/video.lst: No such file or directory
ldap_sasl_bind(SIMPLE): Can't contact LDAP server (-1)
Resolving www.intern (www.intern)... failed: Name or service not known
-Enabling conf localized-error-pages"
+Enabling conf localized-error-pages
+plugins-bad"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# The main routine
errorpatterns="$globalerrorpatterns
diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index 3989e0c..a800cdf 100644
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -13,6 +13,10 @@ xfce4
#task-gnome-desktop
#gnome
+## kde desktop:
+#task-kde-desktop
+#kde-full
+
## xfce desktop:
#xfce4-goodies
#task-xfce4-desktop
diff --git a/fai/config/package_config/LOG_CLIENT b/fai/config/package_config/LOG_CLIENT
index a06b633..b933b55 100644
--- a/fai/config/package_config/LOG_CLIENT
+++ b/fai/config/package_config/LOG_CLIENT
@@ -5,4 +5,4 @@ munin-node
smartmontools
lm-sensors
nagios-nrpe-server
-nagios-plugins-basic
+monitoring-plugins-basic
diff --git a/fai/config/package_config/LOG_SERVER b/fai/config/package_config/LOG_SERVER
index d34937b..58b59dd 100644
--- a/fai/config/package_config/LOG_SERVER
+++ b/fai/config/package_config/LOG_SERVER
@@ -7,7 +7,7 @@ munin
munin-node
icinga
nagios-images
-nagios-plugins-standard
+monitoring-plugins-standard
nagios-nrpe-plugin
dnsutils
diff --git a/fai/config/package_config/SERVER_A b/fai/config/package_config/SERVER_A
index 9c5b4b3..ca239e1 100644
--- a/fai/config/package_config/SERVER_A
+++ b/fai/config/package_config/SERVER_A
@@ -8,6 +8,7 @@ exim4 nullmailer-
etckeeper
unattended-upgrades
# avahi-daemon # CUPS?
+# dbus # logind?
## backup:
dirvish
diff --git a/fai/config/scripts/DEBIAN/40-misc b/fai/config/scripts/DEBIAN/40-misc
index 993b6b0..30ff938 100755
--- a/fai/config/scripts/DEBIAN/40-misc
+++ b/fai/config/scripts/DEBIAN/40-misc
@@ -20,7 +20,6 @@ if [ "$UTC" = "yes" ]; then
else
sed -i -e 's:^UTC$:LOCAL:' $target/etc/adjtime
fi
-sed -i -e 's#/sbin/getty 38400#/sbin/getty --noclear -f /etc/issue.linuxlogo 38400#' ${target}/etc/inittab
rm -f $target/etc/dpkg/dpkg.cfg.d/fai
diff --git a/fai/config/scripts/FAIBASE/20-removable_media b/fai/config/scripts/FAIBASE/20-removable_media
index bac0658..7434730 100755
--- a/fai/config/scripts/FAIBASE/20-removable_media
+++ b/fai/config/scripts/FAIBASE/20-removable_media
@@ -15,7 +15,7 @@ cdromlist() {
fstabline () {
line=$(printf "%-15s %-15s %-7s %-15s %-7s %s\n" "$1" "$2" "$3" "$4" "$5" "$6")
- ainsl /etc/fstab "$line"
+ ainsl /etc/fstab "$line" "^$1"
}
i=0
diff --git a/fai/config/scripts/GRUB_PC/10-setup b/fai/config/scripts/GRUB_PC/10-setup
index 055fcaf..87af602 100755
--- a/fai/config/scripts/GRUB_PC/10-setup
+++ b/fai/config/scripts/GRUB_PC/10-setup
@@ -1,6 +1,11 @@
#! /bin/bash
# support for GRUB version 2
+## Skip completely if not installing:
+if [ "$FAI_ACTION" != "install" ] ; then
+ exit 0
+fi
+
error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
set -a
@@ -11,11 +16,6 @@ set -a
$ROOTCMD update-grub
-# skip the rest, if not an initial installation
-if [ $FAI_ACTION != "install" ]; then
- exit $error
-fi
-
# check if mdadm has been forgotten
if grep -q active /proc/mdstat 2>/dev/null; then
if [ ! -d $target/etc/mdadm ]; then
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index 9a39543..1c5d5ea 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -42,6 +42,7 @@ cat > $target/etc/network/interfaces <<EOF
# The loopback network interface
auto lo
iface lo inet loopback
+ dns-nameserver 127.0.0.1
dns-search intern
# The internal network interface
--
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