[gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/

[Christian Ruppert]

commit:     c5fb64d61f1462d0f8790838424722e161ba4024
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 16:15:08 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 16:15:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c5fb64d6

Make dmesg log optional

Reported-by: Patrick <gentoo <AT> feystorm.net>
X-Gentoo-Bug: 384485
X-Gentoo-Bug-URL: https://bugs.gentoo.org/384485

---
 conf.d/bootmisc    |    4 ++++
 init.d/bootmisc.in |   13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/conf.d/bootmisc b/conf.d/bootmisc
index 2c1670b..d79706c 100644
--- a/conf.d/bootmisc
+++ b/conf.d/bootmisc
@@ -4,3 +4,7 @@ clean_tmp_dirs="/tmp"
 # Should we wipe the tmp paths completely or just selectively remove known
 # locks / files / etc... ?
 wipe_tmp="YES"
+
+# Write the initial dmesg log into /var/log/dmesg after boot
+# This may be useful if you need the kernel boot log afterwards
+log_dmesg="YES"

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 6607f45..2ca7926 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -16,6 +16,7 @@ dir_writeable()
 }
 
 : ${wipe_tmp:=${WIPE_TMP:-yes}}
+: ${log_dmesg:=${LOG_DMESG:-yes}}
 
 cleanup_tmp_dir()
 {
@@ -142,11 +143,13 @@ start()
 		fi
 	fi
 
-	if $logw || dir_writeable /var/log; then
-		# Create an 'after-boot' dmesg log
-		if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
-			dmesg > /var/log/dmesg
-			chmod 640 /var/log/dmesg
+	if yesno $log_dmesg; then
+		if $logw || dir_writeable /var/log; then
+			# Create an 'after-boot' dmesg log
+			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
+				dmesg > /var/log/dmesg
+				chmod 640 /var/log/dmesg
+			fi
 		fi
 	fi