| 1 |
commit: b209fe3859c05c286037843bb34058f849c54b15 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 28 04:01:43 2015 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 2 18:11:04 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b209fe38 |
| 7 |
|
| 8 |
bootmisc: Don't call dmesg in systemd-nspawn containers |
| 9 |
|
| 10 |
This fixes #57. |
| 11 |
|
| 12 |
init.d/bootmisc.in | 11 +++++++---- |
| 13 |
1 file changed, 7 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in |
| 16 |
index dbd258e..13f2389 100644 |
| 17 |
--- a/init.d/bootmisc.in |
| 18 |
+++ b/init.d/bootmisc.in |
| 19 |
@@ -214,10 +214,13 @@ start() |
| 20 |
if yesno $log_dmesg; then |
| 21 |
if $logw || checkpath -W /var/log; then |
| 22 |
# Create an 'after-boot' dmesg log |
| 23 |
- if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ -a "$RC_SYS" != LXC ]; then |
| 24 |
- dmesg > /var/log/dmesg |
| 25 |
- chmod 640 /var/log/dmesg |
| 26 |
- fi |
| 27 |
+ case "$RC_SYS" in |
| 28 |
+ VSERVER|OPENVZ|LXC|SYSTEMD-NSPAWN) ;; |
| 29 |
+ *) |
| 30 |
+ dmesg > /var/log/dmesg |
| 31 |
+ chmod 640 /var/log/dmesg |
| 32 |
+ ;; |
| 33 |
+ esac |
| 34 |
fi |
| 35 |
fi |
Archives