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, 9 insertions, 0 deletions

diff --git a/bootlog b/bootlog
new file mode 100644
index 0000000..b97af0b
--- /dev/null
+++ b/bootlog
@@ -0,0 +1,9 @@
+/var/log/boot {
+    compress
+    rotate 1
+    size=+1024k
+    notifempty
+    missingok
+    copytruncate
+    noolddir
+}