Hi Thomas, hi all,
here are two little patches with minor fixes/improvements for FAI.
0001-Remove-obsoleted-option.patch removes an obsoleted option (-c3,
cf. man rsyslogd) from rsyslogd which gives a possibly confusing
warning at the beginning of installations.
0002-Show-list-of-errors-after-installation.patch is more a matter of
taste: At the end of the installation, all errors are presented in a
numbered list. This allows to check if the installation went well
immediately without taking a look at /tmp/fai/error.log manually or
adjusting the false positive strings.
Thanks for considering,
Andi
>From 24adcd9b46a7252a48b62c72d0ae28b0c96df091 Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <[email protected]>
Date: Mon, 9 Jun 2014 09:14:04 +0200
Subject: [PATCH 1/2] Remove obsoleted option.
---
lib/subroutines | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/subroutines b/lib/subroutines
index a4e4563..022cb7e 100755
--- a/lib/subroutines
+++ b/lib/subroutines
@@ -768,7 +768,7 @@ task_confdir() {
printk=${printk:-6}
echo $printk > /proc/sys/kernel/printk
- rsyslogd -c3
+ rsyslogd
create_resolv_conf
fi
--
2.0.0.rc2
>From 4ce72bead116c2257ad08574e2d8d293bece09f0 Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <[email protected]>
Date: Mon, 9 Jun 2014 09:14:56 +0200
Subject: [PATCH 2/2] Show list of errors after installation
---
examples/simple/hooks/savelog.LAST.source | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/examples/simple/hooks/savelog.LAST.source b/examples/simple/hooks/savelog.LAST.source
index a6f497c..908fb6b 100755
--- a/examples/simple/hooks/savelog.LAST.source
+++ b/examples/simple/hooks/savelog.LAST.source
@@ -174,7 +174,9 @@ if [ "$verbose" ]; then
fi
if [ -s $errfile ]; then
- echo "ERRORS found in log files. See $errfile" >&2
+ echo "ERRORS reported in ${errfile}:"
+ nl $errfile
+ echo "ERRORS found in log files. See above and $errfile" >&2
else
echo "Congratulations! No errors found in log files."
fi
--
2.0.0.rc2
