Merge branch 'snowman'

Conflicts:
	rc.multi
	rc.single

Trivial conflict, and fixed a bug introduced when I imported the patches in the first place (oops).

Signed-off-by: Tom Gundersen <teg@jklm.no>

1 files changed, 4 insertions, 2 deletions

diff --git a/rc.multi b/rc.multi
index 7af9279..1160ab4 100755
--- a/rc.multi
+++ b/rc.multi
@@ -27,9 +27,11 @@ fi
 run_hook multi_end
 
 if [[ -f /run/bootlogd.pid ]]; then
-	/bin/touch /var/log/boot
+	touch /var/log/boot
 	kill $(< /run/bootlogd.pid)
-	/bin/rm -f /run/bootlogd.pid
+	rm -f /run/bootlogd.pid
+	sed -i -r -e 's/\^\[\[[0-9]?;?[0-9]?[0-9]?;?[0-9]?[0-9]?[ms]//g' \
+                  -e 's/\^\[(\[151|%)G//g' /var/log/boot
 fi
 
 # vim: set ts=2 sw=2 noet: