[Fai-commit] r5998 - in branches/stable/3.4: debian examples/simple/hooks

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:55:19 +0000 (Tue, 17 Aug 2010)
New Revision: 5998

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/examples/simple/hooks/savelog.LAST.source
Log:
savelog.LAST: ignore ACPI Warning


Conflicts:

	debian/changelog

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:55:13 UTC (rev 5997)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:55:19 UTC (rev 5998)
@@ -1,4 +1,4 @@
-fai (3.4~beta5) unstable; urgency=low
+fai (3.4~beta6) unstable; urgency=low
 
   [ Thomas Lange ]
   * dhcp-edit: new command that adds or removes entries to/from dhcpd.conf
@@ -41,6 +41,11 @@
   * 30-demo: replace script with shell code in 10-misc
   * 40-misc: replace cfengine script with shell script
   * fai-do-scripts: add cfengine 3 support
+  * subroutines: df output also shows type of file system
+  * mkramdisk,task_sysinfo,updatebase,fai-do-scripts,fai-debconf,
+    faimond-gui,setup-storage,Commands.pm,Exec.pm,Fstab.pm,Init.pm,
+    Parser.pm,Sizes.pm,Volumes.pm: add $Id$
+  * savelog.LAST: ignore ACPI Warning
 
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: branches/stable/3.4/examples/simple/hooks/savelog.LAST.source
===================================================================
--- branches/stable/3.4/examples/simple/hooks/savelog.LAST.source	2010-08-17 12:55:13 UTC (rev 5997)
+++ branches/stable/3.4/examples/simple/hooks/savelog.LAST.source	2010-08-17 12:55:19 UTC (rev 5998)
@@ -120,6 +120,7 @@
 Dummy start-stop-daemon called
 X: bytes  packets  errors
 ACPI Error
+ACPI Warning
 cdrom: open failed."
 
 # add pattern on some conditions